aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

mucwin_affiliation_list_error takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-02 00:38:26 +00:00
parent 2e81a4efa3
commit d81dbdb233
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/mucwin.c
View File

@ -527,13 +527,13 @@ mucwin_broadcast(ProfMucWin *mucwin, const char *const message)
}
void
mucwin_affiliation_list_error(const char *const roomjid, const char *const affiliation,
mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation,
const char *const error)
{
ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
if (window) {
win_vprint(window, '!', 0, NULL, 0, THEME_ERROR, "", "Error retrieving %s list: %s", affiliation, error);
}
assert(mucwin != NULL);
ProfWin *window = (ProfWin*)mucwin;
win_vprint(window, '!', 0, NULL, 0, THEME_ERROR, "", "Error retrieving %s list: %s", affiliation, error);
}
void

3
src/ui/ui.h
View File

@ -197,8 +197,7 @@ void mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick, const
void mucwin_update_occupants(const char *const roomjid);
void mucwin_show_occupants(const char *const roomjid);
void mucwin_hide_occupants(const char *const roomjid);
void mucwin_affiliation_list_error(const char *const roomjid, const char *const affiliation,
const char *const error);
void mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation, const char *const error);
void mucwin_handle_affiliation_list(const char *const roomjid, const char *const affiliation, GSList *jids);
void mucwin_affiliation_set_error(const char *const roomjid, const char *const jid,
const char *const affiliation, const char *const error);

5
src/xmpp/iq.c
View File

@ -1343,7 +1343,10 @@ _room_affiliation_list_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *co
if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
char *error_message = stanza_get_error_message(stanza);
log_debug("Error retrieving %s list for room %s: %s", affiliation, from, error_message);
mucwin_affiliation_list_error(from, affiliation, error_message);
ProfMucWin *mucwin = wins_get_muc(from);
if (mucwin) {
mucwin_affiliation_list_error(mucwin, affiliation, error_message);
}
free(error_message);
free(affiliation);
return 0;

3
tests/unittests/ui/stub_ui.c
View File

@ -271,8 +271,7 @@ 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) {}
void ui_handle_room_config_submit_result(const char * const roomjid) {}
void ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message) {}
void mucwin_affiliation_list_error(const char * const roomjid, const char * const affiliation,
const char * const error) {}
void mucwin_affiliation_list_error(ProfMucWin *mucwin, const char * const affiliation, const char * const error) {}
void mucwin_handle_affiliation_list(const char * const roomjid, const char * const affiliation, GSList *jids) {}
void mucwin_affiliation_set_error(const char * const roomjid, const char * const jid,
const char * const affiliation, const char * const error) {}