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

Renamed chatwin OTR functions

Browse Source
This commit is contained in:
James Booth
2015-10-27 21:23:56 +00:00
parent 0fd616167e
commit 40dcd59727
8 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/otr/otrlibv4.c
View File

@@ -183,24 +183,24 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event,
{
case OTRL_SMPEVENT_ASK_FOR_SECRET:
if (chatwin) {
ui_smp_recipient_initiated(chatwin);
chatwin_otr_smp_init(chatwin);
}
g_hash_table_insert(smp_initiators, strdup(context->username), strdup(context->username));
break;
case OTRL_SMPEVENT_ASK_FOR_ANSWER:
if (chatwin) {
ui_smp_recipient_initiated_q(chatwin, question);
chatwin_otr_smp_init_q(chatwin, question);
}
break;
case OTRL_SMPEVENT_SUCCESS:
if (chatwin) {
if (context->smstate->received_question == 0) {
ui_smp_successful(chatwin);
ui_trust(chatwin);
chatwin_otr_smp_success(chatwin);
chatwin_otr_trust(chatwin);
} else {
ui_smp_answer_success(chatwin);
chatwin_otr_smp_answer_success(chatwin);
}
}
break;
@@ -209,13 +209,13 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event,
if (chatwin) {
if (context->smstate->received_question == 0) {
if (nextMsg == OTRL_SMP_EXPECT3) {
ui_smp_unsuccessful_sender(chatwin);
chatwin_otr_smp_sender_failed(chatwin);
} else if (nextMsg == OTRL_SMP_EXPECT4) {
ui_smp_unsuccessful_receiver(chatwin);
chatwin_otr_smp_receiver_failed(chatwin);
}
ui_untrust(chatwin);
chatwin_otr_untrust(chatwin);
} else {
ui_smp_answer_failure(chatwin);
chatwin_otr_smp_answer_failure(chatwin);
}
}
break;
@@ -230,8 +230,8 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event,
case OTRL_SMPEVENT_ABORT:
if (chatwin) {
ui_smp_aborted(chatwin);
ui_untrust(chatwin);
chatwin_otr_smp_aborted(chatwin);
chatwin_otr_untrust(chatwin);
}
break;