aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Tidy session.c

Browse Source
This commit is contained in:
James Booth 2016-05-06 01:10:12 +01:00
parent 88f423afea
commit cc485ed338
1 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/xmpp/session.c
View File

@ -95,17 +95,7 @@ static void _session_free_saved_account(void);
static void _session_free_saved_details(void);
static void _session_free_session_data(void);
static void
_session_info_destroy(DiscoInfo *info)
{
if (info) {
free(info->item);
if (info->features) {
g_hash_table_destroy(info->features);
}
free(info);
}
}
static void _session_info_destroy(DiscoInfo *info);
void
session_init(void)
@ -359,33 +349,6 @@ session_remove_available_resource(const char *const resource)
g_hash_table_remove(available_resources, resource);
}
void
_session_free_saved_account(void)
{
FREE_SET_NULL(saved_account.name);
FREE_SET_NULL(saved_account.passwd);
}
void
_session_free_saved_details(void)
{
FREE_SET_NULL(saved_details.name);
FREE_SET_NULL(saved_details.jid);
FREE_SET_NULL(saved_details.passwd);
FREE_SET_NULL(saved_details.altdomain);
FREE_SET_NULL(saved_details.tls_policy);
}
void
_session_free_session_data(void)
{
g_slist_free_full(disco_items, (GDestroyNotify)_session_info_destroy);
disco_items = NULL;
g_hash_table_remove_all(available_resources);
chat_sessions_clear();
presence_clear_sub_requests();
}
void
session_login_success(int secured)
{
@ -503,6 +466,32 @@ session_send_stanza(const char *const stanza)
}
}
void
session_lost_connection(void)
{
sv_ev_lost_connection();
if (prefs_get_reconnect() != 0) {
assert(reconnect_timer == NULL);
reconnect_timer = g_timer_new();
} else {
_session_free_saved_account();
_session_free_saved_details();
}
_session_free_session_data();
}
static void
_session_info_destroy(DiscoInfo *info)
{
if (info) {
free(info->item);
if (info->features) {
g_hash_table_destroy(info->features);
}
free(info);
}
}
static jabber_conn_status_t
_session_connect(const char *const fulljid, const char *const passwd, const char *const altdomain, int port,
const char *const tls_policy)
@ -550,16 +539,30 @@ _session_reconnect(void)
}
}
void
session_lost_connection(void)
static void
_session_free_saved_account(void)
{
sv_ev_lost_connection();
if (prefs_get_reconnect() != 0) {
assert(reconnect_timer == NULL);
reconnect_timer = g_timer_new();
} else {
_session_free_saved_account();
_session_free_saved_details();
}
_session_free_session_data();
FREE_SET_NULL(saved_account.name);
FREE_SET_NULL(saved_account.passwd);
}
static void
_session_free_saved_details(void)
{
FREE_SET_NULL(saved_details.name);
FREE_SET_NULL(saved_details.jid);
FREE_SET_NULL(saved_details.passwd);
FREE_SET_NULL(saved_details.altdomain);
FREE_SET_NULL(saved_details.tls_policy);
}
static void
_session_free_session_data(void)
{
g_slist_free_full(disco_items, (GDestroyNotify)_session_info_destroy);
disco_items = NULL;
g_hash_table_remove_all(available_resources);
chat_sessions_clear();
presence_clear_sub_requests();
}