From 21d560f068590023ac9f5ae9301c5737a4614205 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:37:09 +0000 Subject: Renamed ui_handle_room_affiliation_list_error -> mucwin_affiliation_list_error --- src/ui/mucwin.c | 2 +- src/ui/ui.h | 2 +- src/xmpp/iq.c | 2 +- tests/unittests/ui/stub_ui.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 8b1cbd68..396f6331 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -551,7 +551,7 @@ mucwin_broadcast(const char *const roomjid, const char *const message) } void -ui_handle_room_affiliation_list_error(const char *const roomjid, const char *const affiliation, +mucwin_affiliation_list_error(const char *const roomjid, const char *const affiliation, const char *const error) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); diff --git a/src/ui/ui.h b/src/ui/ui.h index c3bcbac1..b0fa4867 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -155,7 +155,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 ui_handle_room_affiliation_list_error(const char *const roomjid, const char *const affiliation, +void mucwin_affiliation_list_error(const char *const roomjid, const char *const affiliation, const char *const error); void ui_handle_room_affiliation_list(const char *const roomjid, const char *const affiliation, GSList *jids); void ui_handle_room_affiliation_set_error(const char *const roomjid, const char *const jid, diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 4f09f565..3f70587e 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -1342,7 +1342,7 @@ _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); - ui_handle_room_affiliation_list_error(from, affiliation, error_message); + mucwin_affiliation_list_error(from, affiliation, error_message); free(error_message); free(affiliation); return 0; diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 1dc6843b..b9a44dd5 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -275,7 +275,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 ui_handle_room_affiliation_list_error(const char * const roomjid, const char * const affiliation, +void mucwin_affiliation_list_error(const char * const roomjid, const char * const affiliation, const char * const error) {} void ui_handle_room_affiliation_list(const char * const roomjid, const char * const affiliation, GSList *jids) {} void ui_handle_room_affiliation_set_error(const char * const roomjid, const char * const jid, -- cgit 1.4.1-2-gfad0