about summary refs log tree commit diff stats
path: root/src/event
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-02-04 00:45:37 +0000
committerJames Booth <boothj5@gmail.com>2016-02-04 00:45:37 +0000
commite1962261a90ceb12860ad64c564a610730c2cc6f (patch)
tree1d22c98fa0d3a533141da311c700923cde703402 /src/event
parentc14ef3390690d732c64bf88a37b23dcdebb6e867 (diff)
downloadprofani-tty-e1962261a90ceb12860ad64c564a610730c2cc6f.tar.gz
Tidy notify_room_message()
Diffstat (limited to 'src/event')
-rw-r--r--src/event/server_events.c19
1 files changed, 4 insertions, 15 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