diff options
| author | James Booth <boothj5@gmail.com> | 2015-10-26 23:45:39 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-10-26 23:45:39 +0000 |
| commit | 3cea2bc4f4ae6d57cf4cdead868c1e02311aca40 (patch) | |
| tree | 2b74f4e5922503d41379ec2b8c4a5770dfb99fd5 /src/otr | |
| parent | 0b51f4d36f4fe91147d2d06930798f84d1878a49 (diff) | |
| download | profani-tty-3cea2bc4f4ae6d57cf4cdead868c1e02311aca40.tar.gz | |
ui_smp_aborted takes ProfChatWin
Diffstat (limited to 'src/otr')
| -rw-r--r-- | src/otr/otrlibv3.c | 5 | ||||
| -rw-r--r-- | src/otr/otrlibv4.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/otr/otrlibv3.c b/src/otr/otrlibv3.c index 3fb85e0e..b12abbff 100644 --- a/src/otr/otrlibv3.c +++ b/src/otr/otrlibv3.c @@ -217,7 +217,10 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP_ABORT); if (tlv) { context->smstate->nextExpected = OTRL_SMP_EXPECT1; - ui_smp_aborted(context->username); + ProfChatWin *chatwin = wins_get_chat(context->username); + if (chatwin) { + ui_smp_aborted(chatwin); + } ui_untrust(context->username); otr_untrust(context->username); } diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index acce648e..089585fb 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -229,7 +229,9 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event, break; case OTRL_SMPEVENT_ABORT: - ui_smp_aborted(context->username); + if (chatwin) { + ui_smp_aborted(chatwin); + } ui_untrust(context->username); break; |