Add nautilus-file-operations-progress-icons.h Don't try create or destroy

2002-03-11  Anders Carlsson  <andersca@gnu.org>

	* libnautilus-private/Makefile.am:
	Add nautilus-file-operations-progress-icons.h
	* src/nautilus-window.c: (nautilus_window_hide_sidebar),
	(nautilus_window_show_sidebar):
	Don't try create or destroy the sidebar on desktop windows.

6 files changed, 17 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 58bf55e8b..f80b41b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-03-11  Anders Carlsson  <andersca@gnu.org>
 
+	* libnautilus-private/Makefile.am:
+	Add nautilus-file-operations-progress-icons.h
+	* src/nautilus-window.c: (nautilus_window_hide_sidebar),
+	(nautilus_window_show_sidebar):
+	Don't try create or destroy the sidebar on desktop windows.
+	
+2002-03-11  Anders Carlsson  <andersca@gnu.org>
+
 	* libnautilus-private/nautilus-file-operations-progress-icons.h:
 	* libnautilus-private/nautilus-file-operations-progress.c:
 	(nautilus_file_operations_progress_update_icon),
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 015236f4a..fb83e70dd 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -73,6 +73,7 @@ libnautilus_private_la_SOURCES = \
 	nautilus-file-dnd.h \
 	nautilus-file-operations-progress.c \
 	nautilus-file-operations-progress.h \
+	nautilus-file-operations-progress-icons.h \
 	nautilus-file-operations.c \
 	nautilus-file-operations.h \
 	nautilus-file-private.h \
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index bb7f2eff6..1031f4d33 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1895,30 +1895,22 @@ nautilus_window_toolbar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar == NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar == NULL) {
 		return;
 	}
 
 	nautilus_window_tear_down_sidebar (window);
-#if 0
-	nautilus_horizontal_splitter_hide
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 void 
 nautilus_window_show_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar != NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar != NULL) {
 		return;
 	}
 
 	nautilus_window_set_up_sidebar (window);
-#if 0	
-	nautilus_horizontal_splitter_show
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index bb7f2eff6..1031f4d33 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -1895,30 +1895,22 @@ nautilus_window_toolbar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar == NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar == NULL) {
 		return;
 	}
 
 	nautilus_window_tear_down_sidebar (window);
-#if 0
-	nautilus_horizontal_splitter_hide
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 void 
 nautilus_window_show_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar != NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar != NULL) {
 		return;
 	}
 
 	nautilus_window_set_up_sidebar (window);
-#if 0	
-	nautilus_horizontal_splitter_show
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index bb7f2eff6..1031f4d33 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -1895,30 +1895,22 @@ nautilus_window_toolbar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar == NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar == NULL) {
 		return;
 	}
 
 	nautilus_window_tear_down_sidebar (window);
-#if 0
-	nautilus_horizontal_splitter_hide
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 void 
 nautilus_window_show_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar != NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar != NULL) {
 		return;
 	}
 
 	nautilus_window_set_up_sidebar (window);
-#if 0	
-	nautilus_horizontal_splitter_show
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index bb7f2eff6..1031f4d33 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1895,30 +1895,22 @@ nautilus_window_toolbar_showing (NautilusWindow *window)
 void 
 nautilus_window_hide_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar == NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar == NULL) {
 		return;
 	}
 
 	nautilus_window_tear_down_sidebar (window);
-#if 0
-	nautilus_horizontal_splitter_hide
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }
 
 void 
 nautilus_window_show_sidebar (NautilusWindow *window)
 {
-	if (window->sidebar != NULL) {
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window) || window->sidebar != NULL) {
 		return;
 	}
 
 	nautilus_window_set_up_sidebar (window);
-#if 0	
-	nautilus_horizontal_splitter_show
-		(NAUTILUS_HORIZONTAL_SPLITTER (window->content_hbox));
-#endif
 	nautilus_window_update_show_hide_menu_items (window);
 }