about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-01 21:52:27 +0000
committerJames Booth <boothj5@gmail.com>2015-11-01 21:52:27 +0000
commit50765190f79bb874229f2ea93e25d37d86dd1d94 (patch)
tree767700a84a13effa7aa539268f069d0ed5c6faf1
parentd47da01c0009a0f40652dd3bb0da564edba412ab (diff)
downloadprofani-tty-50765190f79bb874229f2ea93e25d37d86dd1d94.tar.gz
Renamed ui_handle_room_affiliation_set_error -> mucwin_affiliation_set_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 6dd93bcb..71b25fc2 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -735,7 +735,7 @@ mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role)
 }
 
 void
-ui_handle_room_affiliation_set_error(const char *const roomjid, const char *const jid, const char *const affiliation,
+mucwin_affiliation_set_error(const char *const roomjid, const char *const jid, 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 982f838d..26a3e9fc 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -158,7 +158,7 @@ void ui_handle_room_config_submit_result_error(const char *const roomjid, const
 void mucwin_affiliation_list_error(const char *const roomjid, const char *const affiliation,
     const char *const error);
 void mucwin_handle_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,
+void mucwin_affiliation_set_error(const char *const roomjid, const char *const jid,
     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);
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 55645783..07ab232b 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -1283,7 +1283,7 @@ _room_affiliation_set_result_handler(xmpp_conn_t *const conn, xmpp_stanza_t *con
     if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
         char *error_message = stanza_get_error_message(stanza);
         log_debug("Error setting affiliation %s list for room %s, user %s: %s", affiliation_set->privilege, from, affiliation_set->item, error_message);
-        ui_handle_room_affiliation_set_error(from, affiliation_set->item, affiliation_set->privilege, error_message);
+        mucwin_affiliation_set_error(from, affiliation_set->item, affiliation_set->privilege, error_message);
         free(error_message);
     }
 
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index a81654a9..ed88dd68 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -278,7 +278,7 @@ void ui_handle_room_config_submit_result_error(const char * const roomjid, const
 void mucwin_affiliation_list_error(const char * const roomjid, const char * const affiliation,
     const char * const error) {}
 void mucwin_handle_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,
+void mucwin_affiliation_set_error(const char * const roomjid, const char * const jid,
     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) {}