about summary refs log tree commit diff stats
path: root/src/ui/console.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/console.c')
-rw-r--r--src/ui/console.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/ui/console.c b/src/ui/console.c
index 066ea32c..6081d56a 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1329,6 +1329,11 @@ cons_notify_setting(void)
         else
             cons_show("Messages (/notify message)          : OFF");
 
+        if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TRIGGER))
+            cons_show("Messages trigger (/notify message)  : ON");
+        else
+            cons_show("Messages trigger (/notify message)  : OFF");
+
         if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT))
             cons_show("Messages current (/notify message)  : ON");
         else
@@ -1339,20 +1344,20 @@ cons_notify_setting(void)
         else
             cons_show("Messages text (/notify message)     : OFF");
 
-        if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TRIGGER))
-            cons_show("Messages trigger (/notify message)  : ON");
+        if (prefs_get_boolean(PREF_NOTIFY_ROOM))
+            cons_show("Room messages (/notify room)        : ON");
         else
-            cons_show("Messages trigger (/notify message)  : OFF");
+            cons_show("Room messages (/notify room)        : OFF");
 
-        char *room_setting = prefs_get_string(PREF_NOTIFY_ROOM);
-        if (g_strcmp0(room_setting, "on") == 0) {
-        cons_show    ("Room messages (/notify room)        : ON");
-        } else if (g_strcmp0(room_setting, "off") == 0) {
-        cons_show    ("Room messages (/notify room)        : OFF");
-        } else {
-        cons_show    ("Room messages (/notify room)        : %s", room_setting);
-        }
-        prefs_free_string(room_setting);
+        if (prefs_get_boolean(PREF_NOTIFY_ROOM_MENTION))
+            cons_show("Room mention (/notify room)         : ON");
+        else
+            cons_show("Room mention (/notify room)         : OFF");
+
+        if (prefs_get_boolean(PREF_NOTIFY_ROOM_TRIGGER))
+            cons_show("Room trigger (/notify room)         : ON");
+        else
+            cons_show("Room trigger (/notify room)         : OFF");
 
         if (prefs_get_boolean(PREF_NOTIFY_ROOM_CURRENT))
             cons_show("Room current (/notify room)         : ON");
@@ -1364,11 +1369,6 @@ cons_notify_setting(void)
         else
             cons_show("Room text (/notify room)            : OFF");
 
-        if (prefs_get_boolean(PREF_NOTIFY_ROOM_TRIGGER))
-            cons_show("Room trigger (/notify room)         : ON");
-        else
-            cons_show("Room trigger (/notify room)         : OFF");
-
         if (prefs_get_boolean(PREF_NOTIFY_TYPING))
             cons_show("Composing (/notify typing)          : ON");
         else