1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00

Merge branch 'master' into plugins

Conflicts:
	src/event/server_events.c
This commit is contained in:
James Booth 2016-01-08 00:14:24 +00:00
commit f22b8d8a20

View File

@ -156,10 +156,10 @@ sv_ev_lost_connection(void)
{
cons_show_error("Lost connection.");
roster_destroy();
muc_invites_clear();
chat_sessions_clear();
ui_disconnected();
roster_destroy();
#ifdef PROF_HAVE_LIBGPGME
p_gpg_on_disconnect();
#endif