From d706dcd4bc0819ac0fb9f4b617a95a1a0658650f Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 21:12:53 +0000
Subject: Renamed ui_room_affiliation_change -> mucwin_affiliation_change

---
 src/event/server_events.c    | 2 +-
 src/ui/mucwin.c              | 2 +-
 src/ui/ui.h                  | 2 +-
 tests/unittests/ui/stub_ui.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/event/server_events.c b/src/event/server_events.c
index af7cf6ca..eef13965 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -596,7 +596,7 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c
 
             // affiliation changed
             } else if (g_strcmp0(affiliation, old_affiliation) != 0) {
-                ui_room_affiliation_change(room, affiliation, actor, reason);
+                mucwin_affiliation_change(room, affiliation, actor, reason);
             }
         }
     }
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 9a3ae6b3..9d7f9746 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -54,7 +54,7 @@ mucwin_role_change(const char *const roomjid, const char *const role, const char
 }
 
 void
-ui_room_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
+mucwin_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
     const char *const reason)
 {
     ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index d9d7b7fb..3b23aa5d 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -94,7 +94,7 @@ void ui_room_join(const char *const roomjid, gboolean focus);
 void ui_switch_to_room(const char *const roomjid);
 void mucwin_role_change(const char *const roomjid, const char *const role, const char *const actor,
     const char *const reason);
-void ui_room_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
+void mucwin_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
     const char *const reason);
 void ui_room_role_and_affiliation_change(const char *const roomjid, const char *const role,
     const char *const affiliation, const char *const actor, const char *const reason);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 7157b0e1..8dc0b602 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -193,7 +193,7 @@ void ui_switch_to_room(const char * const roomjid) {}
 
 void mucwin_role_change(const char * const roomjid, const char * const role, const char * const actor,
     const char * const reason) {}
-void ui_room_affiliation_change(const char * const roomjid, const char * const affiliation, const char * const actor,
+void mucwin_affiliation_change(const char * const roomjid, const char * const affiliation, const char * const actor,
     const char * const reason) {}
 void ui_room_role_and_affiliation_change(const char * const roomjid, const char * const role,
     const char * const affiliation, const char * const actor, const char * const reason) {}
-- 
cgit 1.4.1-2-gfad0