From 2cc5f17871e2fe3c6c8acdf747b4bfb7acc13566 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:48:28 +0000 Subject: [PATCH] Renamed ui_handle_room_role_list_error -> mucwin_role_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 3a57f2da..f0617ff5 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -642,7 +642,7 @@ mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) } void -ui_handle_room_role_list_error(const char *const roomjid, const char *const role, const char *const error) +mucwin_role_list_error(const char *const roomjid, const char *const role, const char *const error) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); if (window) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 10cc66e2..cde39c01 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -162,7 +162,7 @@ void ui_handle_room_affiliation_set_error(const char *const roomjid, const char const char *const affiliation, const char *const error); void ui_handle_room_role_set_error(const char *const roomjid, const char *const nick, const char *const role, const char *const error); -void ui_handle_room_role_list_error(const char *const roomjid, const char *const role, const char *const error); +void mucwin_role_list_error(const char *const roomjid, const char *const role, const char *const error); void ui_handle_room_role_list(const char *const roomjid, const char *const role, GSList *nicks); void mucwin_kick_error(const char *const roomjid, const char *const nick, const char *const error); void ui_show_form(ProfMucConfWin *confwin); diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 06ef7e10..d5f9c554 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -1390,7 +1390,7 @@ _room_role_list_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const sta 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", role, from, error_message); - ui_handle_room_role_list_error(from, role, error_message); + mucwin_role_list_error(from, role, error_message); free(error_message); free(role); return 0; diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 1814c807..c3b263df 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -282,7 +282,7 @@ void ui_handle_room_affiliation_set_error(const char * const roomjid, const char const char * const affiliation, const char * const error) {} void ui_handle_room_role_set_error(const char * const roomjid, const char * const nick, const char * const role, const char * const error) {} -void ui_handle_room_role_list_error(const char * const roomjid, const char * const role, const char * const error) {} +void mucwin_role_list_error(const char * const roomjid, const char * const role, const char * const error) {} void ui_handle_room_role_list(const char * const roomjid, const char * const role, GSList *nicks) {} void mucwin_kick_error(const char * const roomjid, const char * const nick, const char * const error) {} void ui_show_form(ProfMucConfWin *confwin) {}