From 8e9bf083895ba7101115594a39dace62a59ab28f Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 3 Jan 2016 17:23:36 +0000 Subject: Add cl_ev_disconnect --- src/command/commands.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/command/commands.c') diff --git a/src/command/commands.c b/src/command/commands.c index c58a1588..225deda5 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -984,24 +984,13 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args) gboolean cmd_disconnect(ProfWin *window, const char *const command, gchar **args) { - if (jabber_get_connection_status() == JABBER_CONNECTED) { - char *jid = strdup(jabber_get_fulljid()); - cons_show("%s logged out successfully.", jid); - jabber_disconnect(); - roster_clear(); - muc_invites_clear(); - chat_sessions_clear(); - tlscerts_clear_current(); - ui_disconnected(); - ui_close_all_wins(); -#ifdef HAVE_LIBGPGME - p_gpg_on_disconnect(); -#endif - free(jid); - } else { + if (jabber_get_connection_status() != JABBER_CONNECTED) { cons_show("You are not currently connected."); + return TRUE; } + cl_ev_disconnect(); + return TRUE; } -- cgit 1.4.1-2-gfad0