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.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ui/core.c b/src/ui/core.c
index 7b3190ed..8f946d68 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -376,7 +376,11 @@ _ui_incoming_msg(const char * const from, const char * const message,
     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)) ) {
-            notify_message(display_from, ui_index);
+            if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_TEXT)) {
+                notify_message(display_from, ui_index, message);
+            } else {
+                notify_message(display_from, ui_index, NULL);
+            }
         }
     }
 
@@ -1723,7 +1727,11 @@ _ui_room_message(const char * const room_jid, const char * const nick,
             gboolean is_current = wins_is_current(window);
             if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_ROOM_CURRENT)) ) {
                 Jid *jidp = jid_create(room_jid);
-                notify_room_message(nick, jidp->localpart, ui_index);
+                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);
+                }
                 jid_destroy(jidp);
             }
         }