about summary refs log tree commit diff stats
path: root/src/ui/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/core.c')
-rw-r--r--src/ui/core.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/ui/core.c b/src/ui/core.c
index cb295244..36b73f33 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -473,20 +473,8 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
         beep();
     }
 
-    int ui_index = num;
-    if (ui_index == 10) {
-        ui_index = 0;
-    }
-
     if (prefs_get_boolean(PREF_NOTIFY_MESSAGE)) {
-        gboolean is_current = wins_is_current(window);
-        if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT)) ) {
-            if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TEXT)) {
-                notify_message(display_name, ui_index, message);
-            } else {
-                notify_message(display_name, ui_index, NULL);
-            }
-        }
+        notify_message(window, display_name, message);
     }
 
     free(display_name);
@@ -525,24 +513,12 @@ ui_incoming_private_msg(const char * const fulljid, const char * const message,
         }
     }
 
-    int ui_index = num;
-    if (ui_index == 10) {
-        ui_index = 0;
-    }
-
     if (prefs_get_boolean(PREF_BEEP)) {
         beep();
     }
 
     if (prefs_get_boolean(PREF_NOTIFY_MESSAGE)) {
-        gboolean is_current = wins_is_current(window);
-        if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT)) ) {
-            if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TEXT)) {
-                notify_message(display_from, ui_index, message);
-            } else {
-                notify_message(display_from, ui_index, NULL);
-            }
-        }
+        notify_message(window, display_from, message);
     }
 
     free(display_from);