mucwin_broadcast takes ProfMucWin

1 files changed, 13 insertions, 15 deletions

diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index f4e104ca..a7668479 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -506,25 +506,23 @@ mucwin_kick_error(ProfMucWin *mucwin, const char *const nick, const char *const
 }
 
 void
-mucwin_broadcast(const char *const roomjid, const char *const message)
+mucwin_broadcast(ProfMucWin *mucwin, const char *const message)
 {
-    ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
-    if (window == NULL) {
-        log_error("Received room broadcast, but no window open for %s.", roomjid);
-    } else {
-        int num = wins_get_num(window);
+    assert(mucwin != NULL);
 
-        win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "Room message: ");
-        win_vprint(window, '!', 0, NULL, NO_DATE, 0, "", "%s", message);
+    ProfWin *window = (ProfWin*)mucwin;
+    int num = wins_get_num(window);
 
-        // currently in groupchat window
-        if (wins_is_current(window)) {
-            status_bar_active(num);
+    win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "Room message: ");
+    win_vprint(window, '!', 0, NULL, NO_DATE, 0, "", "%s", message);
 
-        // not currently on groupchat window
-        } else {
-            status_bar_new(num);
-        }
+    // currently in groupchat window
+    if (wins_is_current(window)) {
+        status_bar_active(num);
+
+    // not currently on groupchat window
+    } else {
+        status_bar_new(num);
     }
 }