From 51c9d4186ec3bcd21e684415f66fdbf69cfa53c9 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 21:20:11 +0000
Subject: [PATCH] Renamed ui_room_roster -> mucwin_roster

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

diff --git a/src/command/commands.c b/src/command/commands.c
index d8408937..59e3979f 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1158,7 +1158,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
 
         // no arg, show all contacts
         if ((presence == NULL) || (g_strcmp0(presence, "any") == 0)) {
-            ui_room_roster(mucwin->roomjid, occupants, NULL);
+            mucwin_roster(mucwin->roomjid, occupants, NULL);
 
         // available
         } else if (strcmp("available", presence) == 0) {
@@ -1172,7 +1172,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
                 occupants = g_list_next(occupants);
             }
 
-            ui_room_roster(mucwin->roomjid, filtered, "available");
+            mucwin_roster(mucwin->roomjid, filtered, "available");
 
         // unavailable
         } else if (strcmp("unavailable", presence) == 0) {
@@ -1186,7 +1186,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
                 occupants = g_list_next(occupants);
             }
 
-            ui_room_roster(mucwin->roomjid, filtered, "unavailable");
+            mucwin_roster(mucwin->roomjid, filtered, "unavailable");
 
         // show specific status
         } else {
@@ -1201,7 +1201,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args)
                 occupants = g_list_next(occupants);
             }
 
-            ui_room_roster(mucwin->roomjid, filtered, presence);
+            mucwin_roster(mucwin->roomjid, filtered, presence);
         }
 
         g_list_free(occupants);
diff --git a/src/event/server_events.c b/src/event/server_events.c
index 6ffd8805..0684903a 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -559,7 +559,7 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c
         // show roster if occupants list disabled by default
         if (!prefs_get_boolean(PREF_OCCUPANTS)) {
             GList *occupants = muc_roster(room);
-            ui_room_roster(room, occupants, NULL);
+            mucwin_roster(room, occupants, NULL);
             g_list_free(occupants);
         }
 
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index b87ba1f8..d574604c 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -181,7 +181,7 @@ mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *fe
 }
 
 void
-ui_room_roster(const char *const roomjid, GList *roster, const char *const presence)
+mucwin_roster(const char *const roomjid, GList *roster, const char *const presence)
 {
     ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
     if (window == NULL) {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 661801a7..adf54b14 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -104,7 +104,7 @@ void mucwin_occupant_affiliation_change(const char *const roomjid, const char *c
     const char *const affiliation, const char *const actor, const char *const reason);
 void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick,
     const char *const role, const char *const affiliation, const char *const actor, const char *const reason);
-void ui_room_roster(const char *const roomjid, GList *occupants, const char *const presence);
+void mucwin_roster(const char *const roomjid, GList *occupants, const char *const presence);
 void ui_room_history(const char *const roomjid, const char *const nick, GDateTime *timestamp,
     const char *const message);
 void ui_room_message(const char *const roomjid, const char *const nick, const char *const message);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 12234684..572dba59 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -203,7 +203,7 @@ void mucwin_occupant_affiliation_change(const char * const roomjid, const char *
     const char * const actor, const char * const reason) {}
 void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role,
     const char * const affiliation, const char * const actor, const char * const reason) {}
-void ui_room_roster(const char * const roomjid, GList *occupants, const char * const presence) {}
+void mucwin_roster(const char * const roomjid, GList *occupants, const char * const presence) {}
 void ui_room_history(const char * const roomjid, const char * const nick,
     GDateTime *timestamp, const char * const message) {}
 void ui_room_message(const char * const roomjid, const char * const nick,