devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 17:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into roomconfig

Browse Source 
Conflicts:
	src/server_events.h
This commit is contained in:
James Booth
2014-09-07 21:54:04 +01:00
parent ee6208866a 8f08c7a21e
commit 14ede0e44c
3 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server_events.h
View File

@@ -95,6 +95,7 @@ void handle_presence_error(const char *from, const char * const type,
const char *err_msg);
void handle_xmpp_stanza(const char * const msg);
void handle_ping_result(const char * const from, int millis);
void handle_ping_error_result(const char * const from, const char * const error);
void handle_room_configure(const char * const room, DataForm *form);
void handle_room_configuration_form_error(void);