diff options
| author | James Booth <boothj5@gmail.com> | 2015-10-26 23:29:01 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-10-26 23:29:01 +0000 |
| commit | 3ce55de1e172c37ba32cdb7b2200b8758e2c8459 (patch) | |
| tree | ec1197e162a016e44e39432581d0d82eef01eaee /src/otr | |
| parent | 55e857d6a8ccd3c5f993ac867c864e7b22be1645 (diff) | |
| download | profani-tty-3ce55de1e172c37ba32cdb7b2200b8758e2c8459.tar.gz | |
ui_smp_recipient_initiated_q takes ProfChatWin
Diffstat (limited to 'src/otr')
| -rw-r--r-- | src/otr/otrlibv3.c | 11 | ||||
| -rw-r--r-- | src/otr/otrlibv4.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/otr/otrlibv3.c b/src/otr/otrlibv3.c index fa574bfc..52b9a022 100644 --- a/src/otr/otrlibv3.c +++ b/src/otr/otrlibv3.c @@ -152,10 +152,13 @@ otrlib_handle_tlvs(OtrlUserState user_state, OtrlMessageAppOps *ops, ConnContext if (nextMsg != OTRL_SMP_EXPECT1) { otrl_message_abort_smp(user_state, ops, NULL, context); } else { - char *question = (char *)tlv->data; - char *eoq = memchr(question, '\0', tlv->len); - if (eoq) { - ui_smp_recipient_initiated_q(context->username, question); + ProfChatWin *chatwin = wins_get_chat(context->username); + if (chatwin) { + char *question = (char *)tlv->data; + char *eoq = memchr(question, '\0', tlv->len); + if (eoq) { + ui_smp_recipient_initiated_q(chatwin, question); + } } } } diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index 1f2c4057..59cd7a0d 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -189,7 +189,9 @@ cb_handle_smp_event(void *opdata, OtrlSMPEvent smp_event, break; case OTRL_SMPEVENT_ASK_FOR_ANSWER: - ui_smp_recipient_initiated_q(context->username, question); + if (chatwin) { + ui_smp_recipient_initiated_q(chatwin, question); + } break; case OTRL_SMPEVENT_SUCCESS: |