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

Merge branch 'master' into xep-0184

Browse Source 
Conflicts:
	src/server_events.c
	src/ui/core.c
	src/ui/ui.h
	tests/ui/stub_ui.c
This commit is contained in:
James Booth
2015-03-14 23:10:51 +00:00
parent a79ea3cbe2 385336c10b
commit ca30ff3910
4 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ui/stub_ui.c
View File

@@ -202,6 +202,7 @@ void ui_disconnected(void) {}
void ui_recipient_gone(const char * const barejid, const char * const resource) {}
void ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id) {}
void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message) {}
void ui_outgoing_private_msg(const char * const fulljid, const char * const message) {}
void ui_room_join(const char * const roomjid, gboolean focus) {}