about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-01 21:37:09 +0000
committerJames Booth <boothj5@gmail.com>2015-11-01 21:37:09 +0000
commit21d560f068590023ac9f5ae9301c5737a4614205 (patch)
tree49f47d69cea75b2301f3799ebd5171f2b6ea1ef9
parentb26e6060615cfff42b56ef5e40c178a2e9502368 (diff)
downloadprofani-tty-21d560f068590023ac9f5ae9301c5737a4614205.tar.gz
Renamed ui_handle_room_affiliation_list_error -> mucwin_affiliation_list_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 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,