aboutsummaryrefslogtreecommitdiffstats
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>2011-01-28 21:28:07 +0800
commitab30e5cff24a01f75cb0f08b138b13504253e2c0 (patch)
treecb10cef8d5e7e53e607e138acd02bd90764fc096
parentd0af8490d944fc16124768917be17059010e9b1a (diff)
downloadgsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar.gz
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar.bz2
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar.lz
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar.xz
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.tar.zst
gsoc2013-empathy-ab30e5cff24a01f75cb0f08b138b13504253e2c0.zip
chat-window: don't display notifications for pending messages (#635513)
-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 79d27f95b..d953355a5 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1426,7 +1426,11 @@ chat_window_new_message_cb (EmpathyChat *chat,
empathy_sound_play (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 */