Moved jabber_free_resources call

3 files changed, 1 insertions, 14 deletions

diff --git a/src/jabber.c b/src/jabber.c
index 6b16e16d..a326ce56 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -70,17 +70,6 @@ jabber_init(const int disable_tls)
     jabber_conn.tls_disabled = disable_tls;
 }
 
-void
-jabber_shutdown(void)
-{
-    // free memory for connection and context
-    xmpp_conn_release(jabber_conn.conn);
-    xmpp_ctx_free(jabber_conn.ctx);
-
-    // shutdown libstrophe
-    xmpp_shutdown();
-}
-
 jabber_conn_status_t
 jabber_connect(const char * const user, 
     const char * const passwd)
diff --git a/src/jabber.h b/src/jabber.h
index 84483c79..c10c9ca6 100644
--- a/src/jabber.h
+++ b/src/jabber.h
@@ -41,7 +41,6 @@ typedef enum {
 } jabber_presence_t;
 
 void jabber_init(const int disable_tls);
-void jabber_shutdown(void);
 jabber_conn_status_t jabber_connect(const char * const user, 
     const char * const passwd);
 gboolean jabber_disconnect(void);
diff --git a/src/profanity.c b/src/profanity.c
index 2c652b3b..0b909935 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -281,9 +281,8 @@ _shutdown_init(void)
         while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
             jabber_process_events();
         }
-        jabber_shutdown();
+        jabber_free_resources();
     }
-    jabber_free_resources();
 
     _shutdown();
 }