nautilus r14100 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Sun Apr 27 18:16:40 2008
New Revision: 14100
URL: http://svn.gnome.org/viewvc/nautilus?rev=14100&view=rev

Log:
2008-04-27  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-navigation-window.c:
	(nautilus_navigation_window_save_geometry):
	Always properly remember window size, also in the case the window is
	closed being maximized. (#385176).


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-navigation-window.c

Modified: trunk/src/nautilus-navigation-window.c
==============================================================================
--- trunk/src/nautilus-navigation-window.c	(original)
+++ trunk/src/nautilus-navigation-window.c	Sun Apr 27 18:16:40 2008
@@ -1536,13 +1536,17 @@
 nautilus_navigation_window_save_geometry (NautilusNavigationWindow *window)
 {
 	char *geometry_string;
+	gboolean is_maximized;
 
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
 	if (GTK_WIDGET(window)->window) {
 		geometry_string = eel_gtk_window_get_geometry_string (GTK_WINDOW (window));
+		is_maximized = gdk_window_get_state (GTK_WIDGET (window)->window)
+				& GDK_WINDOW_STATE_MAXIMIZED;
 		
-		if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY)) {
+		if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY) &&
+		    !is_maximized) {
 			eel_preferences_set
 				(NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY, 
 				 geometry_string);
@@ -1552,7 +1556,7 @@
 		if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_MAXIMIZED)) {
 			eel_preferences_set_boolean
 				(NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_MAXIMIZED, 
-				 gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_MAXIMIZED);
+				 is_maximized);
 		}
 	}
 }