Re: [PATCH] always show statusbar for spatial windows

[James Willcox <jwillcox gnome org>]

Um, this patch is better.

On Thu, 2004-04-08 at 14:10 -0500, James Willcox wrote:
> Hi,
> 
> The attached patch fixes 138967 (don't let the nav window's statusbar
> pref affect spatial windows).
> 
> James

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.6165
diff -u -r1.6165 ChangeLog
--- ChangeLog	7 Apr 2004 17:22:26 -0000	1.6165
+++ ChangeLog	8 Apr 2004 19:47:58 -0000
@@ -1,3 +1,13 @@
+2004-04-08  James Willcox  <jwillcox gnome org>
+
+	* src/nautilus-navigation-window.c:
+	(nautilus_navigation_window_show):
+	* src/nautilus-spatial-window.c: (nautilus_spatial_window_show):
+	* src/nautilus-window.c: (nautilus_window_show):
+
+        Always show the status bar if the window is a spatial one.
+	Fixes 138967.
+
 2004-04-07  Alexander Larsson  <alexl redhat com>
 
 	* libnautilus-private/nautilus-program-choosing.c:
Index: src/nautilus-navigation-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window.c,v
retrieving revision 1.422
diff -u -r1.422 nautilus-navigation-window.c
--- src/nautilus-navigation-window.c	11 Jan 2004 20:34:39 -0000	1.422
+++ src/nautilus-navigation-window.c	8 Apr 2004 19:47:58 -0000
@@ -1467,6 +1467,12 @@
 		nautilus_navigation_window_hide_sidebar (window);
 	}
 
+	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) {
+		nautilus_window_show_status_bar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_status_bar (NAUTILUS_WINDOW (window));
+	}
+
 	GTK_WIDGET_CLASS (parent_class)->show (widget);
 }
 
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.431
diff -u -r1.431 nautilus-window.c
--- src/nautilus-window.c	7 Apr 2004 10:54:26 -0000	1.431
+++ src/nautilus-window.c	8 Apr 2004 19:47:58 -0000
@@ -1353,14 +1353,9 @@
 
 	window = NAUTILUS_WINDOW (widget);
 
-	GTK_WIDGET_CLASS (parent_class)->show (widget);
-
-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) {
-		nautilus_window_show_status_bar (window);
-	} else {
-		nautilus_window_hide_status_bar (window);
-	}
 
+	GTK_WIDGET_CLASS (parent_class)->show (widget);
+	
 	nautilus_window_ui_update (window);
 }