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 01:36:49 +00:00
commit eaf25a713a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event/server_events.c
View File

@ -545,6 +545,12 @@ sv_ev_contact_offline(char *barejid, char *resource, char *status)
ui_contact_offline(barejid, resource, status); ui_contact_offline(barejid, resource, status);
} }
ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin && otr_is_secure(barejid)) {
chatwin_otr_unsecured(chatwin);
otr_end_session(chatwin->barejid);
}
rosterwin_roster(); rosterwin_roster();
chat_session_remove(barejid); chat_session_remove(barejid);
} }

2
src/ui/core.c
View File

@ -992,7 +992,7 @@ ui_contact_offline(char *barejid, char *resource, char *status)
chatwin_contact_offline(chatwin, resource, status); chatwin_contact_offline(chatwin, resource, status);
} }
// show in char win if "online" and presence online // show in chat win if "online" and presence online
} else if (g_strcmp0(show_chat_win, "online") == 0) { } else if (g_strcmp0(show_chat_win, "online") == 0) {
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {