From 6779c5bf682b3e71852e22a20cc38eebf6483469 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 2 Nov 2015 01:01:37 +0000
Subject: [PATCH] mucwin_hide_occupants takes ProfMucWin

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

diff --git a/src/command/commands.c b/src/command/commands.c
index 0d658576..a3c45d76 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -3180,7 +3180,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args)
             mucwin->showjid = FALSE;
             mucwin_update_occupants(mucwin);
         } else {
-            mucwin_hide_occupants(mucwin->roomjid);
+            mucwin_hide_occupants(mucwin);
         }
     } else {
         cons_bad_cmd_usage(command);
diff --git a/src/ui/core.c b/src/ui/core.c
index b00a703d..75fa61fb 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -647,7 +647,7 @@ ui_hide_all_room_rosters(void)
         if (window->type == WIN_MUC && win_has_active_subwin(window)) {
             ProfMucWin *mucwin = (ProfMucWin*)window;
             assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
-            mucwin_hide_occupants(mucwin->roomjid);
+            mucwin_hide_occupants(mucwin);
         }
         curr = g_list_next(curr);
     }
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 6406b291..fb224598 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -773,10 +773,12 @@ mucwin_show_occupants(ProfMucWin *mucwin)
 }
 
 void
-mucwin_hide_occupants(const char *const roomjid)
+mucwin_hide_occupants(ProfMucWin *mucwin)
 {
-    ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
-    if (window && win_has_active_subwin(window)) {
+    assert(mucwin != NULL);
+
+    ProfWin *window = (ProfWin*)mucwin;
+    if (win_has_active_subwin(window)) {
         wins_hide_subwin(window);
     }
 }
diff --git a/src/ui/ui.h b/src/ui/ui.h
index a08208b3..b3753dbb 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -196,7 +196,7 @@ void mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick, const
     const char *const status);
 void mucwin_update_occupants(ProfMucWin *mucwin);
 void mucwin_show_occupants(ProfMucWin *mucwin);
-void mucwin_hide_occupants(const char *const roomjid);
+void mucwin_hide_occupants(ProfMucWin *mucwin);
 void mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation, const char *const error);
 void mucwin_handle_affiliation_list(ProfMucWin *mucwin, const char *const affiliation, GSList *jids);
 void mucwin_affiliation_set_error(ProfMucWin *mucwin, const char *const jid, const char *const affiliation,
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 308f8a7e..b98f630a 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -233,7 +233,7 @@ void mucwin_occupant_presence(ProfMucWin *mucwin, const char * const nick, const
     const char * const status) {}
 void mucwin_update_occupants(ProfMucWin *mucwin) {}
 void mucwin_show_occupants(ProfMucWin *mucwin) {}
-void mucwin_hide_occupants(const char * const roomjid) {}
+void mucwin_hide_occupants(ProfMucWin *mucwin) {}
 void ui_show_roster(void) {}
 void ui_hide_roster(void) {}
 void ui_roster_add(const char * const barejid, const char * const name) {}