From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 9 Dec 2011 16:16:06 +0000 (+0100)
Subject: empathy_chat_window_present_chat: move to the chat window desktop
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=a85a11da129679dcc8a6bfc350462fcf1e877f97

empathy_chat_window_present_chat: move to the chat window desktop

This is more coherent with Shell's 'app is ready' notication which moves the
view to the app desktop rather than moving the app itself.

https://bugzilla.gnome.org/show_bug.cgi?id=649208
---

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 9ad6b297..1bb9de4a 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -2488,8 +2488,12 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
 	}
 
 	empathy_chat_window_switch_to_chat (window, chat);
-	empathy_window_present_with_time (GTK_WINDOW (priv->dialog),
-	  x_timestamp);
+
+	/* Don't use empathy_window_present_with_time () which would move the window
+	 * to our current desktop but move to the window's desktop instead. This is
+	 * more coherent with Shell's 'app is ready' notication which moves the view
+	 * to the app desktop rather than moving the app itself. */
+	empathy_move_to_window_desktop (GTK_WINDOW (priv->dialog), x_timestamp);
 
 	gtk_widget_grab_focus (chat->input_text_view);
 }