devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

ui_smp_successful takes ProfChatWin

Browse Source
This commit is contained in:
James Booth
2015-10-26 23:50:56 +00:00
parent 3cea2bc4f4
commit 8bd74cefcf
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/otr/otrlibv3.c
View File

@@ -177,11 +177,13 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
} else {
context->smstate->nextExpected = OTRL_SMP_EXPECT1;
if (context->smstate->received_question == 0) {
ProfChatWin *chatwin = wins_get_chat(context->username);
if (context->active_fingerprint->trust && (context->active_fingerprint->trust[0] != '\0')) {
ui_smp_successful(context->username);
if (chatwin) {
ui_smp_successful(chatwin);
}
ui_trust(context->username);
} else {
ProfChatWin *chatwin = wins_get_chat(context->username);
if (chatwin) {
ui_smp_unsuccessful_sender(chatwin);
}
@@ -202,11 +204,13 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext
otrl_message_abort_smp(user_state, ops, NULL, context);
} else {
context->smstate->nextExpected = OTRL_SMP_EXPECT1;
ProfChatWin *chatwin = wins_get_chat(context->username);
if (context->active_fingerprint->trust && (context->active_fingerprint->trust[0] != '\0')) {
ui_smp_successful(context->username);
if (chatwin) {
ui_smp_successful(chatwin);
}
ui_trust(context->username);
} else {
ProfChatWin *chatwin = wins_get_chat(context->username);
if (chatwin) {
ui_smp_unsuccessful_receiver(chatwin);
}

4
src/otr/otrlibv4.c
View File

@@ -196,7 +196,9 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event,
case OTRL_SMPEVENT_SUCCESS:
if (context->smstate->received_question == 0) {
ui_smp_successful(context->username);
if (chatwin) {
ui_smp_successful(chatwin);
}
ui_trust(context->username);
} else {
ui_smp_answer_success(context->username);