Added initial stabber test

This commit is contained in:
James Booth
2015-05-17 22:05:43 +01:00
parent 97c5072f56
commit 2c5b44421e
13 changed files with 60 additions and 16 deletions

View File

@@ -82,7 +82,7 @@ prefs_load(void)
{
GError *err;
log_info("Loading preferences");
// log_info("Loading preferences");
prefs_loc = _get_preferences_file();
if (g_file_test(prefs_loc, G_FILE_TEST_EXISTS)) {
@@ -739,4 +739,4 @@ _get_default_string(preference_t pref)
default:
return NULL;
}
}
}

View File

@@ -207,12 +207,15 @@ theme_close(void)
{
if (theme) {
g_key_file_free(theme);
theme = NULL;
}
if (theme_loc) {
g_string_free(theme_loc, TRUE);
theme_loc = NULL;
}
if (bold_items) {
g_hash_table_destroy(bold_items);
bold_items = NULL;
}
}
@@ -613,4 +616,4 @@ theme_attrs(theme_item_t attrs)
return result;
}
}
}

View File

@@ -100,7 +100,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
otr_poll();
#endif
notify_remind();
jabber_process_events();
jabber_process_events(10);
ui_update();
}
}

View File

@@ -194,7 +194,7 @@ jabber_disconnect(void)
xmpp_disconnect(jabber_conn.conn);
while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
jabber_process_events();
jabber_process_events(10);
}
_connection_free_saved_account();
_connection_free_saved_details();
@@ -222,10 +222,11 @@ jabber_shutdown(void)
_connection_free_session_data();
xmpp_shutdown();
free(jabber_conn.log);
jabber_conn.log = NULL;
}
void
jabber_process_events(void)
jabber_process_events(int millis)
{
int reconnect_sec;
@@ -234,7 +235,7 @@ jabber_process_events(void)
case JABBER_CONNECTED:
case JABBER_CONNECTING:
case JABBER_DISCONNECTING:
xmpp_run_once(jabber_conn.ctx, 10);
xmpp_run_once(jabber_conn.ctx, millis);
break;
case JABBER_DISCONNECTED:
reconnect_sec = prefs_get_reconnect();
@@ -577,4 +578,4 @@ _xmpp_get_file_logger()
file_log->userdata = &level;
return file_log;
}
}

View File

@@ -136,7 +136,7 @@ jabber_conn_status_t jabber_connect_with_details(const char * const jid,
jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account);
void jabber_disconnect(void);
void jabber_shutdown(void);
void jabber_process_events(void);
void jabber_process_events(int millis);
const char * jabber_get_fulljid(void);
const char * jabber_get_domain(void);
jabber_conn_status_t jabber_get_connection_status(void);