aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 21:58:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 23:30:22 +0800
commit16b77581e53f068035343c0daf302ffb73303134 (patch)
tree0821c0c70fef30d3809de319cdd18b68c4b8757a /src
parentfb049bcc5f5622b56112c947b5b571c6f0956671 (diff)
downloadgsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar.gz
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar.bz2
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar.lz
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar.xz
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.tar.zst
gsoc2013-empathy-16b77581e53f068035343c0daf302ffb73303134.zip
chat-window: don't display notifications for pending messages (#635513)
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-window.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 1eeba2756..210478304 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -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 */