From bb14b19bb194bb0212e244eefc8d025e536d7386 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:18:13 +0000 Subject: [PATCH] Renamed ui_handle_room_info_error -> mucwin_room_info_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 08ef824f..6515eb7a 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -130,7 +130,7 @@ mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const cha } void -ui_handle_room_info_error(const char *const roomjid, const char *const error) +mucwin_room_info_error(const char *const roomjid, 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 47b087ac..addb6e9c 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -114,7 +114,7 @@ void ui_room_destroy(const char *const roomjid); void ui_show_room_info(ProfMucWin *mucwin); void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role); void ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation); -void ui_handle_room_info_error(const char *const roomjid, const char *const error); +void mucwin_room_info_error(const char *const roomjid, const char *const error); void ui_show_room_disco_info(const char *const roomjid, GSList *identities, GSList *features); void ui_room_destroyed(const char *const roomjid, const char *const reason, const char *const new_jid, const char *const password); diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 8f19871b..d6a7ad55 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -1507,7 +1507,7 @@ _room_info_response_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { if (cb_data->display) { char *error_message = stanza_get_error_message(stanza); - ui_handle_room_info_error(cb_data->room, error_message); + mucwin_room_info_error(cb_data->room, error_message); free(error_message); } free(cb_data->room); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index a85f512d..40a50ff3 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -214,7 +214,7 @@ void ui_room_destroy(const char * const roomjid) {} void ui_show_room_info(ProfMucWin *mucwin) {} void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role) {} void ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) {} -void ui_handle_room_info_error(const char * const roomjid, const char * const error) {} +void mucwin_room_info_error(const char * const roomjid, const char * const error) {} void ui_show_room_disco_info(const char * const roomjid, GSList *identities, GSList *features) {} void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid, const char * const password) {}