devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-30 17:06:22 +00:00
Code Issues Packages Projects 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

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);