empathy r1153 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Sat Jun  7 17:23:21 2008
New Revision: 1153
URL: http://svn.gnome.org/viewvc/empathy?rev=1153&view=rev

Log:
Set position/size of chat window only when adding the first chat. Fixes bug #536391 (Ross Burton).


Modified:
   trunk/src/empathy-chat-window.c

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Sat Jun  7 17:23:21 2008
@@ -1299,20 +1299,23 @@
 	/* Reference the chat object */
 	g_object_ref (chat);
 
-	empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &w, &h);
-
-	if (x >= 0 && y >= 0) {
-		/* Let the window manager position it if we don't have
-		 * good x, y coordinates.
-		 */
-		gtk_window_move (GTK_WINDOW (priv->dialog), x, y);
-	}
-
-	if (w > 0 && h > 0) {
-		/* Use the defaults from the glade file if we don't have
-		 * good w, h geometry.
-		 */
-		gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
+	/* If this window has just been created, position it */
+	if (priv->chats == NULL) {
+		empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &w, &h);
+		
+		if (x >= 0 && y >= 0) {
+			/* Let the window manager position it if we don't have
+			 * good x, y coordinates.
+			 */
+			gtk_window_move (GTK_WINDOW (priv->dialog), x, y);
+		}
+		
+		if (w > 0 && h > 0) {
+			/* Use the defaults from the glade file if we don't have
+			 * good w, h geometry.
+			 */
+			gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
+		}
 	}
 
 	child = GTK_WIDGET (chat);