aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 00:39:39 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-25 02:44:09 +0800
commitc633b9b25a6bd729b8441382332e807d31331a93 (patch)
treeeed9e8127a79238bcc3eee06336d7d33e38d145d /src
parent14eab5e164f0078f7d0bfbd580b8ecd19e61d72f (diff)
downloadgsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar.gz
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar.bz2
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar.lz
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar.xz
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.tar.zst
gsoc2013-empathy-c633b9b25a6bd729b8441382332e807d31331a93.zip
Pass the ChannelDispatcher timestamp onwards to window_present
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-window.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index bdd80ea5e..ca569e11d 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -2288,9 +2288,16 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
empathy_chat_window_add_chat (window, chat);
}
+ /* Don't force the window to show itself when it wasn't
+ * an action by the user
+ */
+ if (timestamp == EMPATHY_DISPATCHER_NON_USER_ACTION)
+ return;
+
priv = GET_PRIV (window);
empathy_chat_window_switch_to_chat (window, chat);
- empathy_window_present (GTK_WINDOW (priv->dialog));
+ empathy_window_present_with_time (GTK_WINDOW (priv->dialog),
+ CLAMP (timestamp, 0, G_MAXUINT32));
gtk_widget_grab_focus (chat->input_text_view);
}