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

Merge remote-tracking branch 'incertia/exit-title'

Browse Source 
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
This commit is contained in:
James Booth
2015-01-12 01:12:42 +00:00
parent c64484c6ed 22cc641905
commit 0d0ed9b7ca
11 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ui/stub_ui.c
View File

@@ -284,6 +284,7 @@ void ui_handle_error(const char * const err_msg)
}
void ui_clear_win_title(void) {}
void ui_goodbye_title(void) {}
void ui_handle_room_join_error(const char * const roomjid, const char * const err) {}
void ui_handle_room_configuration(const char * const roomjid, DataForm *form) {}
void ui_handle_room_configuration_form_error(const char * const roomjid, const char * const message) {}