devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 13:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui_gone_insecure takes ProfChatWin

Browse Source
This commit is contained in:
James Booth
2015-10-26 23:10:30 +00:00
parent 4fb0b4b0da
commit 9d3bcf5f90
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/commands.c
View File

@@ -4939,7 +4939,7 @@ cmd_otr(ProfWin *window, const char *const command, gchar **args)
return TRUE; return TRUE;
} }
ui_gone_insecure(chatwin->barejid); ui_gone_insecure(chatwin);
otr_end_session(chatwin->barejid); otr_end_session(chatwin->barejid);
return TRUE; return TRUE;

5
src/otr/otr.c
View File

@@ -739,7 +739,10 @@ otr_decrypt_message(const char *const from, const char *const message, gboolean
if (tlv) { if (tlv) {
if (context) { if (context) {
otrl_context_force_plaintext(context); otrl_context_force_plaintext(context);
ui_gone_insecure(from); ProfChatWin *chatwin = wins_get_chat(from);
if (chatwin) {
ui_gone_insecure(chatwin);
}
} }
} }

17
src/ui/chatwin.c
View File

@@ -82,18 +82,15 @@ ui_gone_secure(ProfChatWin *chatwin, gboolean trusted)
} }
void void
ui_gone_insecure(const char *const barejid) ui_gone_insecure(ProfChatWin *chatwin)
{ {
ProfChatWin *chatwin = wins_get_chat(barejid); chatwin->is_otr = FALSE;
if (chatwin) { chatwin->otr_is_trusted = FALSE;
chatwin->is_otr = FALSE;
chatwin->otr_is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_print(window, '!', 0, NULL, 0, THEME_OTR_ENDED, "", "OTR session ended."); win_print(window, '!', 0, NULL, 0, THEME_OTR_ENDED, "", "OTR session ended.");
if (wins_is_current(window)) { if (wins_is_current(window)) {
title_bar_switch(); title_bar_switch();
}
} }
} }

2
src/ui/ui.h
View File

@@ -63,7 +63,7 @@ void ui_switch_win(ProfWin *window);
void ui_sigwinch_handler(int sig); void ui_sigwinch_handler(int sig);
void ui_gone_secure(ProfChatWin *chatwin, gboolean trusted); void ui_gone_secure(ProfChatWin *chatwin, gboolean trusted);
void ui_gone_insecure(const char *const barejid); void ui_gone_insecure(ProfChatWin *chatwin);
void ui_trust(const char *const barejid); void ui_trust(const char *const barejid);
void ui_untrust(const char *const barejid); void ui_untrust(const char *const barejid);
void ui_smp_recipient_initiated(const char *const barejid); void ui_smp_recipient_initiated(const char *const barejid);

2
tests/unittests/ui/stub_ui.c
View File

@@ -67,7 +67,7 @@ GSList* ui_get_chat_recipients(void)
void ui_switch_win(ProfWin *win) {} void ui_switch_win(ProfWin *win) {}
void ui_gone_secure(ProfChatWin *chatwin, gboolean trusted) {} void ui_gone_secure(ProfChatWin *chatwin, gboolean trusted) {}
void ui_gone_insecure(const char * const barejid) {} void ui_gone_insecure(ProfChatWin *chatwin) {}
void ui_trust(const char * const barejid) {} void ui_trust(const char * const barejid) {}
void ui_untrust(const char * const barejid) {} void ui_untrust(const char * const barejid) {}
void ui_smp_recipient_initiated(const char * const barejid) {} void ui_smp_recipient_initiated(const char * const barejid) {}