about summary refs log tree commit diff stats
path: root/src/ui
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-02 00:14:16 +0000
committerJames Booth <boothj5@gmail.com>2015-11-02 00:14:16 +0000
commitb3150ef8e122f5c48dc0794cd1337c7f72ad7653 (patch)
tree37a1db5c4d13b77e0d7f716c4360da74a4c66d49 /src/ui
parentd505a92d1e2f9c47d2e46c4ac934f16abb131308 (diff)
downloadprofani-tty-b3150ef8e122f5c48dc0794cd1337c7f72ad7653.tar.gz
mucwin_occupant_presence takes ProfMucWin
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/mucwin.c12
-rw-r--r--src/ui/ui.h2
2 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index b7d41800..2051d8a6 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -304,15 +304,13 @@ mucwin_occupant_online(ProfMucWin *mucwin, const char *const nick, const char *c
 }
 
 void
-mucwin_occupant_presence(const char *const roomjid, const char *const nick,
+mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick,
     const char *const show, const char *const status)
 {
-    ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
-    if (window == NULL) {
-        log_error("Received presence for room participant %s, but no window open for %s.", nick, roomjid);
-    } else {
-        win_show_status_string(window, nick, show, status, NULL, "++", "online");
-    }
+    assert(mucwin != NULL);
+
+    ProfWin *window = (ProfWin*)mucwin;
+    win_show_status_string(window, nick, show, status, NULL, "++", "online");
 }
 
 void
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 25212f27..6790cd51 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -193,7 +193,7 @@ void mucwin_occupant_online(ProfMucWin *mucwin, const char *const nick, const ch
     const char *const affiliation, const char *const show, const char *const status);
 void mucwin_occupant_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick);
 void mucwin_nick_change(const char *const roomjid, const char *const nick);
-void mucwin_occupant_presence(const char *const roomjid, const char *const nick, const char *const show,
+void mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick, const char *const show,
     const char *const status);
 void mucwin_update_occupants(const char *const roomjid);
 void mucwin_show_occupants(const char *const roomjid);