aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-01-03 02:24:34 +00:00
commit 924d457e40
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/commands.c
View File

@ -993,6 +993,7 @@ cmd_disconnect(ProfWin *window, const char *const command, gchar **args)
chat_sessions_clear(); chat_sessions_clear();
tlscerts_clear_current(); tlscerts_clear_current();
ui_disconnected(); ui_disconnected();
ui_close_all_wins();
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
p_gpg_on_disconnect(); p_gpg_on_disconnect();
#endif #endif

2
src/event/server_events.c
View File

@ -545,11 +545,13 @@ sv_ev_contact_offline(char *barejid, char *resource, char *status)
ui_contact_offline(barejid, resource, status); ui_contact_offline(barejid, resource, status);
} }
#ifdef HAVE_LIBOTR
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin && otr_is_secure(barejid)) { if (chatwin && otr_is_secure(barejid)) {
chatwin_otr_unsecured(chatwin); chatwin_otr_unsecured(chatwin);
otr_end_session(chatwin->barejid); otr_end_session(chatwin->barejid);
} }
#endif
rosterwin_roster(); rosterwin_roster();
chat_session_remove(barejid); chat_session_remove(barejid);