about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-01 21:34:28 +0000
committerJames Booth <boothj5@gmail.com>2015-11-01 21:34:28 +0000
commita575ab174cba020a96c24e6a43d1120523bd7e4e (patch)
tree2f25029fa0fe9cd332c27ee21d1e1ec60a704111
parent25020df0f0905c0f8b469765fd75fa366161a29c (diff)
downloadprofani-tty-a575ab174cba020a96c24e6a43d1120523bd7e4e.tar.gz
Renamed ui_handle_room_kick_error -> mucwin_kick_error
-rw-r--r--src/ui/mucwin.c2
-rw-r--r--src/ui/ui.h2
-rw-r--r--src/xmpp/iq.c2
-rw-r--r--tests/unittests/ui/stub_ui.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index b2de4825..058565a2 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -517,7 +517,7 @@ mucwin_subject(const char *const roomjid, const char *const nick, const char *co
 }
 
 void
-ui_handle_room_kick_error(const char *const roomjid, const char *const nick, const char *const error)
+mucwin_kick_error(const char *const roomjid, const char *const nick, const char *const error)
 {
     ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
     if (window == NULL) {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 6699444c..d8ca5b8c 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -164,7 +164,7 @@ void ui_handle_room_role_set_error(const char *const roomjid, const char *const
     const char *const error);
 void ui_handle_room_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 ui_handle_room_kick_error(const char *const roomjid, const char *const nick, const char *const error);
+void mucwin_kick_error(const char *const roomjid, const char *const nick, const char *const error);
 void ui_show_form(ProfMucConfWin *confwin);
 void ui_show_form_field(ProfWin *window, DataForm *form, char *tag);
 void ui_show_form_help(ProfMucConfWin *confwin);
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index f4c02279..4f09f565 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -1463,7 +1463,7 @@ _room_kick_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza,
     // handle error responses
     if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
         char *error_message = stanza_get_error_message(stanza);
-        ui_handle_room_kick_error(from, nick, error_message);
+        mucwin_kick_error(from, nick, error_message);
         free(error_message);
         free(nick);
         return 0;
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 68028c3a..8fdc6b98 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -284,7 +284,7 @@ void ui_handle_room_role_set_error(const char * const roomjid, const char * cons
     const char * const error) {}
 void ui_handle_room_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 ui_handle_room_kick_error(const char * const roomjid, const char * const nick, const char * const error) {}
+void mucwin_kick_error(const char * const roomjid, const char * const nick, const char * const error) {}
 void ui_show_form(ProfMucConfWin *confwin) {}
 void ui_show_form_field(ProfWin *window, DataForm *form, char *tag) {}
 void ui_show_form_help(ProfMucConfWin *confwin) {}