Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-30 23:38:28 +01:00
7 changed files with 30 additions and 90 deletions

View File

@@ -66,9 +66,6 @@ GSList* ui_get_chat_recipients(void)
void ui_switch_win(ProfWin *win) {}
void ui_next_win(void) {}
void ui_previous_win(void) {}
void ui_gone_secure(const char * const barejid, gboolean trusted) {}
void ui_gone_insecure(const char * const barejid) {}
void ui_trust(const char * const barejid) {}