Tidy notify_room_message()

2 files changed, 12 insertions, 18 deletions

diff --git a/src/event/server_events.c b/src/event/server_events.c
index 35466be3..42d75cdb 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -305,22 +305,11 @@ sv_ev_room_message(const char *const room_jid, const char *const nick, const cha
         beep();
     }
 
-    if (!notify) {
-        return;
-    }
-
-    Jid *jidp = jid_create(mucwin->roomjid);
-    int ui_index = num;
-    if (ui_index == 10) {
-        ui_index = 0;
-    }
-
-    if (prefs_get_boolean(PREF_NOTIFY_ROOM_TEXT)) {
-        notify_room_message(nick, jidp->localpart, ui_index, message);
-    } else {
-        notify_room_message(nick, jidp->localpart, ui_index, NULL);
+    if (notify) {
+        Jid *jidp = jid_create(mucwin->roomjid);
+        notify_room_message(nick, jidp->localpart, num, message);
+        jid_destroy(jidp);
     }
-    jid_destroy(jidp);
 }
 
 void
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index fda5aedd..23d942fb 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -117,11 +117,16 @@ notify_message(const char *const name, int num, const char *const text)
 }
 
 void
-notify_room_message(const char *const nick, const char *const room, int win, const char *const text)
+notify_room_message(const char *const nick, const char *const room, int num, const char *const text)
 {
+    int ui_index = num;
+    if (ui_index == 10) {
+        ui_index = 0;
+    }
+
     GString *message = g_string_new("");
-    g_string_append_printf(message, "%s in %s (win %d)", nick, room, win);
-    if (text) {
+    g_string_append_printf(message, "%s in %s (win %d)", nick, room, ui_index);
+    if (text && prefs_get_boolean(PREF_NOTIFY_ROOM_TEXT)) {
         g_string_append_printf(message, "\n%s", text);
     }