devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
James Booth
2015-06-05 23:02:56 +01:00
parent a3693cfbe7 ae4e07ad87
commit 9aff8abd2e
82 changed files with 968 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xmpp/connection.c
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;
}
}

2
src/xmpp/xmpp.h
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);