]> git.0d.be Git - empathy.git/commitdiff
chat-window: don't display notifications for pending messages (#635513)
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 30 Nov 2010 13:58:09 +0000 (14:58 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 30 Nov 2010 15:30:22 +0000 (16:30 +0100)
src/empathy-chat-window.c

index 1eeba275640482abe61bee6c1ed2230af60c6fd2..21047830411dee304cf1378606c07575333b3e00 100644 (file)
@@ -1458,7 +1458,11 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 
                empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (priv->dialog),
                    EMPATHY_SOUND_MESSAGE_INCOMING);
-               chat_window_show_or_update_notification (window, message, chat);
+
+               /* Pending messages have already been displayed in the approver, so we don't
+               * display a notification for those. */
+               if (!pending)
+                       chat_window_show_or_update_notification (window, message, chat);
        }
 
        /* update the number of unread messages and the window icon */