aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Removed connection_shutdown function

Browse Source
This commit is contained in:
James Booth 2013-02-27 21:21:47 +00:00
parent 83171aff5b
commit 24f0d9e6e5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/xmpp/connection.c
View File

@ -88,7 +88,6 @@ static int _ping_timed_handler(xmpp_conn_t * const conn, void * const userdata);
void _connection_free_saved_account(void); void _connection_free_saved_account(void);
void _connection_free_saved_details(void); void _connection_free_saved_details(void);
void _connection_free_session_data(void); void _connection_free_session_data(void);
void _connection_shutdown(void);
void void
jabber_init(const int disable_tls) jabber_init(const int disable_tls)
@ -171,7 +170,9 @@ jabber_disconnect(void)
_connection_free_saved_account(); _connection_free_saved_account();
_connection_free_saved_details(); _connection_free_saved_details();
_connection_free_session_data(); _connection_free_session_data();
_connection_shutdown(); xmpp_conn_release(jabber_conn.conn);
xmpp_ctx_free(jabber_conn.ctx);
xmpp_shutdown();
} }
jabber_conn.conn_status = JABBER_STARTED; jabber_conn.conn_status = JABBER_STARTED;
@ -306,14 +307,6 @@ _connection_free_session_data(void)
presence_free_sub_requests(); presence_free_sub_requests();
} }
void
_connection_shutdown(void)
{
xmpp_conn_release(jabber_conn.conn);
xmpp_ctx_free(jabber_conn.ctx);
xmpp_shutdown();
}
int int
connection_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, connection_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata) void * const userdata)
@ -479,7 +472,9 @@ _connection_handler(xmpp_conn_t * const conn,
_connection_free_saved_account(); _connection_free_saved_account();
_connection_free_saved_details(); _connection_free_saved_details();
_connection_free_session_data(); _connection_free_session_data();
_connection_shutdown(); xmpp_conn_release(jabber_conn.conn);
xmpp_ctx_free(jabber_conn.ctx);
xmpp_shutdown();
} }
// login attempt failed // login attempt failed
@ -491,7 +486,9 @@ _connection_handler(xmpp_conn_t * const conn,
_connection_free_saved_account(); _connection_free_saved_account();
_connection_free_saved_details(); _connection_free_saved_details();
_connection_free_session_data(); _connection_free_session_data();
_connection_shutdown(); xmpp_conn_release(jabber_conn.conn);
xmpp_ctx_free(jabber_conn.ctx);
xmpp_shutdown();
} else { } else {
log_debug("Connection handler: Restarting reconnect timer"); log_debug("Connection handler: Restarting reconnect timer");
if (prefs_get_reconnect() != 0) { if (prefs_get_reconnect() != 0) {