From fdd00b33a448c20682834ff64210ad914cc9f522 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 21:19:08 +0000
Subject: [PATCH] Renamed ui_show_room_disco_info -> mucwin_room_disco_info

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

diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 6515eb7a..b87ba1f8 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -140,7 +140,7 @@ mucwin_room_info_error(const char *const roomjid, const char *const error)
 }
 
 void
-ui_show_room_disco_info(const char *const roomjid, GSList *identities, GSList *features)
+mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features)
 {
     ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
     if (window) {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index addb6e9c..661801a7 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -115,7 +115,7 @@ void ui_show_room_info(ProfMucWin *mucwin);
 void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role);
 void ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation);
 void mucwin_room_info_error(const char *const roomjid, const char *const error);
-void ui_show_room_disco_info(const char *const roomjid, GSList *identities, GSList *features);
+void mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features);
 void ui_room_destroyed(const char *const roomjid, const char *const reason, const char *const new_jid,
     const char *const password);
 void ui_room_kicked(const char *const roomjid, const char *const actor, const char *const reason);
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index d6a7ad55..f4c02279 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -1561,7 +1561,7 @@ _room_info_response_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza
 
         muc_set_features(cb_data->room, features);
         if (cb_data->display) {
-            ui_show_room_disco_info(cb_data->room, identities, features);
+            mucwin_room_disco_info(cb_data->room, identities, features);
         }
 
         g_slist_free_full(features, free);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 40a50ff3..12234684 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -215,7 +215,7 @@ void ui_show_room_info(ProfMucWin *mucwin) {}
 void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role) {}
 void ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) {}
 void mucwin_room_info_error(const char * const roomjid, const char * const error) {}
-void ui_show_room_disco_info(const char * const roomjid, GSList *identities, GSList *features) {}
+void mucwin_room_disco_info(const char * const roomjid, GSList *identities, GSList *features) {}
 void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid,
     const char * const password) {}
 void ui_room_kicked(const char * const roomjid, const char * const actor, const char * const reason) {}