Removed all the stuff that was used to show/hide sidebars.

2002-11-05  James Willcox  <jwillcox@gnome.org>

	* libnautilus-private/apps_nautilus_preferences.schemas:
	* libnautilus-private/nautilus-global-preferences.c:
	* libnautilus-private/nautilus-sidebar-functions.c:
	(sidebar_get_sidebar_panel_view_identifiers),
	(nautilus_sidebar_get_all_sidebar_panel_view_identifiers):
	* libnautilus-private/nautilus-sidebar-functions.h:
	* src/nautilus-window.c: (nautilus_window_instance_init),
	(nautilus_window_set_up_sidebar), (add_sidebar_panels):

	Removed all the stuff that was used to show/hide sidebars.

9 files changed, 46 insertions, 343 deletions

diff --git a/ChangeLog b/ChangeLog
index 43ac02f23..383f8732d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-05  James Willcox  <jwillcox@gnome.org>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas:
+	* libnautilus-private/nautilus-global-preferences.c:
+	* libnautilus-private/nautilus-sidebar-functions.c:
+	(sidebar_get_sidebar_panel_view_identifiers),
+	(nautilus_sidebar_get_all_sidebar_panel_view_identifiers):
+	* libnautilus-private/nautilus-sidebar-functions.h:
+	* src/nautilus-window.c: (nautilus_window_instance_init),
+	(nautilus_window_set_up_sidebar), (add_sidebar_panels):
+
+	Removed all the stuff that was used to show/hide sidebars.
+
 2002-11-05  Diego Gonzalez  <diego@pemas.net>
 
 	* po/POTFILES.in: remove nautilus-preferences-dialog.c and
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas b/libnautilus-private/apps_nautilus_preferences.schemas
index ca775c497..f61bd46a2 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas
+++ b/libnautilus-private/apps_nautilus_preferences.schemas
@@ -683,35 +683,6 @@
     </schema>
     
     <schema>
-      <key>/schemas/apps/nautilus/news/max_items</key>
-      <applyto>/apps/nautilus/news/max_items</applyto>
-      <owner>nautilus</owner>
-      <type>int</type>
-      <default>6</default>
-      <locale name="C">
-         <short>Maximum number of news items per site</short>
-         <long>
-          Maximum number of news items to show per site in the news sidebar.
-         </long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/nautilus/news/update_interval</key>
-      <applyto>/apps/nautilus/news/update_interval</applyto>
-      <owner>nautilus</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-         <short>News update frequency in minutes</short>
-         <long>
-	  How many minutes to wait between checking the sites in the
-	  news sidebar for updates.
-         </long>
-      </locale>
-    </schema>     
-    
-    <schema>
       <key>/schemas/apps/nautilus/preferences/add_to_session</key>
       <applyto>/apps/nautilus/preferences/add_to_session</applyto>
       <owner>nautilus</owner>
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 0854ec6ce..87a5d45e2 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -492,34 +492,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  "default_zoom_level"
 	},
 
-	/* Sidebar panel default */
-	{ nautilus_sidebar_news_enabled_preference_name,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (TRUE)
-	},
-	{ nautilus_sidebar_notes_enabled_preference_name,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (TRUE)
-	},
-	{ nautilus_sidebar_history_enabled_preference_name,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (TRUE)
-	},
-	{ nautilus_sidebar_tree_enabled_preference_name,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (FALSE)
-	},
-
-	/* news panel preferences */
-	{ NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS,
-	  PREFERENCE_INTEGER,
-	  GINT_TO_POINTER (6)
-	},
-	{ NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL,
-	  PREFERENCE_INTEGER,
-	  GINT_TO_POINTER (5)
-	},
-
 	/* non-visible preferences */
 	{ NAUTILUS_PREFERENCES_ADD_TO_SESSION,
 	  PREFERENCE_BOOLEAN,
diff --git a/libnautilus-private/nautilus-sidebar-functions.c b/libnautilus-private/nautilus-sidebar-functions.c
index b95977167..4f71c3c3e 100644
--- a/libnautilus-private/nautilus-sidebar-functions.c
+++ b/libnautilus-private/nautilus-sidebar-functions.c
@@ -25,31 +25,10 @@
 #include <config.h>
 #include "nautilus-sidebar-functions.h"
 
-#include "nautilus-global-preferences.h"
 #include "nautilus-view-identifier.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 
-#define PREFERENCES_SIDEBAR_PANEL_PREFIX "sidebar-panels"
-
-#define NEWS_PANEL_IID		"OAFIID:Nautilus_News_View"
-#define NOTES_PANEL_IID		"OAFIID:Nautilus_Notes_View"
-#define HISTORY_PANEL_IID	"OAFIID:Nautilus_History_View"
-#define TREE_PANEL_IID		"OAFIID:Nautilus_Tree_View"
-
-const char nautilus_sidebar_news_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NEWS_PANEL_IID;
-const char nautilus_sidebar_notes_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NOTES_PANEL_IID;
-const char nautilus_sidebar_history_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" HISTORY_PANEL_IID;
-const char nautilus_sidebar_tree_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" TREE_PANEL_IID;
-
-static char *
-sidebar_panel_make_preference_key (const char *panel_iid)
-{
-	g_return_val_if_fail (panel_iid != NULL, NULL);
-
-	return g_strconcat (PREFERENCES_SIDEBAR_PANEL_PREFIX "/", panel_iid, NULL);
-}
-
 static int
 compare_view_identifiers (gconstpointer a, gconstpointer b)
 {
@@ -65,29 +44,6 @@ compare_view_identifiers (gconstpointer a, gconstpointer b)
 	return eel_strcmp (idenfifier_a->name, idenfifier_b->name);
 }
 
-static gboolean
-sidebar_is_sidebar_panel_enabled (NautilusViewIdentifier *panel_identifier)
-{
-	gboolean enabled;
-        gchar  *key;
-	
-	g_return_val_if_fail (panel_identifier != NULL, FALSE);
-	g_return_val_if_fail (panel_identifier->iid != NULL, FALSE);
-	
-	key = sidebar_panel_make_preference_key (panel_identifier->iid);
-	g_return_val_if_fail (key != NULL, FALSE);
-        enabled = eel_preferences_get_boolean (key);
-        g_free (key);
-
-        return enabled;
-}
-
-static gboolean
-sidebar_is_sidebar_panel_enabled_cover (gpointer data, gpointer callback_data)
-{
-	return sidebar_is_sidebar_panel_enabled (data);
-}
-
 /* Make a query to find out what sidebar panels are available. */
 static GList *
 sidebar_get_sidebar_panel_view_identifiers (void)
@@ -101,7 +57,8 @@ sidebar_get_sidebar_panel_view_identifiers (void)
 
 	CORBA_exception_init (&ev);
 
-	query = "nautilus:sidebar_panel_name.defined() AND repo_ids.has ('IDL:Bonobo/Control:1.0')";
+	/* get all the sidebars, and ignore the "loser" ones */
+	query = "nautilus:sidebar_panel_name.defined() AND repo_ids.has ('IDL:Bonobo/Control:1.0') AND (NOT test_only == true)";
 
 	bonobo_activation_result = bonobo_activation_query (query, NULL, &ev);
 		
@@ -128,46 +85,7 @@ sidebar_get_sidebar_panel_view_identifiers (void)
 }
 
 GList *
-nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers (void)
-{
-	GList *enabled_view_identifiers;
- 	GList *disabled_view_identifiers;
-        
-	enabled_view_identifiers = sidebar_get_sidebar_panel_view_identifiers ();
-
-	enabled_view_identifiers = eel_g_list_partition (enabled_view_identifiers,
-							      sidebar_is_sidebar_panel_enabled_cover,
-							      NULL,
-							      &disabled_view_identifiers);
-	
-	nautilus_view_identifier_list_free (disabled_view_identifiers);
-	
-        return enabled_view_identifiers;
-}
-
-void
-nautilus_sidebar_for_each_panel (NautilusSidebarPanelCallback callback,
-				 gpointer callback_data)
+nautilus_sidebar_get_all_sidebar_panel_view_identifiers (void)
 {
-	char *preference_key;
-	GList *view_identifiers;
-	GList *node;
-	NautilusViewIdentifier *identifier;
-
-	g_return_if_fail (callback != NULL);
-
-	view_identifiers = sidebar_get_sidebar_panel_view_identifiers ();
-
-	for (node = view_identifiers; node != NULL; node = node->next) {
-		g_assert (node->data != NULL);
-		identifier = node->data;
-		
-		preference_key = sidebar_panel_make_preference_key (identifier->iid);
-
-		(* callback) (identifier->name, identifier->iid, preference_key, callback_data);
-
-		g_free (preference_key);
-	}
-
-	nautilus_view_identifier_list_free (view_identifiers);
+	return sidebar_get_sidebar_panel_view_identifiers ();
 }
diff --git a/libnautilus-private/nautilus-sidebar-functions.h b/libnautilus-private/nautilus-sidebar-functions.h
index df9f29b7d..03d007d77 100644
--- a/libnautilus-private/nautilus-sidebar-functions.h
+++ b/libnautilus-private/nautilus-sidebar-functions.h
@@ -27,22 +27,7 @@
 
 #include <glib/glist.h>
 
-extern const char nautilus_sidebar_news_enabled_preference_name[];
-extern const char nautilus_sidebar_notes_enabled_preference_name[];
-extern const char nautilus_sidebar_history_enabled_preference_name[];
-extern const char nautilus_sidebar_tree_enabled_preference_name[];
-
-/*
- * A callback which can be invoked for each sidebar panel available.
- */
-typedef void (*NautilusSidebarPanelCallback) (const char *name,
-					      const char *iid,
-					      const char *preference_key,
-					      gpointer callback_data);
-
-GList *nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers (void);
-void   nautilus_sidebar_for_each_panel                             (NautilusSidebarPanelCallback callback,
-								    gpointer                     callback_data);
+GList *nautilus_sidebar_get_all_sidebar_panel_view_identifiers (void);
 
 #endif /* NAUTILUS_SIDEBAR_FUNCTIONS_H */
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 4eb08d389..af87078b6 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -118,9 +118,8 @@ enum {
 static GList *history_list;
 static int side_pane_width_auto_value = SIDE_PANE_MINIMUM_WIDTH;
 
-static void update_sidebar_panels_from_preferences (NautilusWindow *window);
-static void sidebar_panels_changed_callback        (gpointer        user_data);
-static void cancel_view_as_callback                (NautilusWindow *window);
+static void add_sidebar_panels                  (NautilusWindow *window);
+static void cancel_view_as_callback             (NautilusWindow *window);
 
 GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
 			 BonoboWindow, BONOBO_TYPE_WINDOW)
@@ -156,23 +155,6 @@ set_up_default_icon_list (void)
 }
 
 static void
-add_sidebar_panel_callback (const char *name,
-			    const char *iid,
-			    const char *preference_key,
-			    gpointer callback_data) 
-{
-	g_assert (name != NULL);
-	g_assert (iid != NULL);
-	g_assert (preference_key != NULL);
-	g_assert (NAUTILUS_IS_WINDOW (callback_data));
-	
-	eel_preferences_add_callback_while_alive (preference_key,
-						  sidebar_panels_changed_callback,
-						  callback_data,
-						  G_OBJECT (callback_data));
-}
-
-static void
 nautilus_window_instance_init (NautilusWindow *window)
 {
 	window->details = g_new0 (NautilusWindowDetails, 1);
@@ -208,9 +190,6 @@ nautilus_window_instance_init (NautilusWindow *window)
 
 	gtk_quit_add_destroy (1, GTK_OBJECT (window));
 
-	/* Keep track of changes in enabled state of sidebar panels */
-	nautilus_sidebar_for_each_panel (add_sidebar_panel_callback, window);
-
 	/* Keep the main event loop alive as long as the window exists */
 	nautilus_main_event_loop_register (GTK_OBJECT (window));
 }
@@ -676,7 +655,7 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
 				      _("Information"));
 
 	/* Set up the sidebar panels. */
-	update_sidebar_panels_from_preferences (window);
+	add_sidebar_panels (window);
 	
 	gtk_widget_show (GTK_WIDGET (window->sidebar));
 }
@@ -1930,18 +1909,14 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 }
 
 /**
- * update_sidebar_panels_from_preferences:
+ * add_sidebar_panels:
  * @window:	A NautilusWindow
  *
- * Update the current list of sidebar panels from preferences.   
- *
- * Disabled panels are removed if they are already in the list.
- *
- * Enabled panels are added if they are not already in the list.
+ * Adds all sidebars available
  *
  */
 static void
-update_sidebar_panels_from_preferences (NautilusWindow *window)
+add_sidebar_panels (NautilusWindow *window)
 {
 	GList *identifier_list;
 
@@ -1951,25 +1926,11 @@ update_sidebar_panels_from_preferences (NautilusWindow *window)
 		return;
 	}
 
-	/* Obtain list of enabled view identifiers */
-	identifier_list = nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers ();
+	identifier_list = nautilus_sidebar_get_all_sidebar_panel_view_identifiers ();
 	nautilus_window_set_sidebar_panels (window, identifier_list);
 	nautilus_view_identifier_list_free (identifier_list);
 }
 
-/**
- * sidebar_panels_changed_callback:
- * @user_data:	Callback data
- *
- * Called when enabled/disabled preferences change for any
- * sidebar panel.
- */
-static void
-sidebar_panels_changed_callback (gpointer user_data)
-{
-	update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
-}
-
 static void 
 show_dock_item (NautilusWindow *window, const char *dock_item_path)
 {
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 4eb08d389..af87078b6 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -118,9 +118,8 @@ enum {
 static GList *history_list;
 static int side_pane_width_auto_value = SIDE_PANE_MINIMUM_WIDTH;
 
-static void update_sidebar_panels_from_preferences (NautilusWindow *window);
-static void sidebar_panels_changed_callback        (gpointer        user_data);
-static void cancel_view_as_callback                (NautilusWindow *window);
+static void add_sidebar_panels                  (NautilusWindow *window);
+static void cancel_view_as_callback             (NautilusWindow *window);
 
 GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
 			 BonoboWindow, BONOBO_TYPE_WINDOW)
@@ -156,23 +155,6 @@ set_up_default_icon_list (void)
 }
 
 static void
-add_sidebar_panel_callback (const char *name,
-			    const char *iid,
-			    const char *preference_key,
-			    gpointer callback_data) 
-{
-	g_assert (name != NULL);
-	g_assert (iid != NULL);
-	g_assert (preference_key != NULL);
-	g_assert (NAUTILUS_IS_WINDOW (callback_data));
-	
-	eel_preferences_add_callback_while_alive (preference_key,
-						  sidebar_panels_changed_callback,
-						  callback_data,
-						  G_OBJECT (callback_data));
-}
-
-static void
 nautilus_window_instance_init (NautilusWindow *window)
 {
 	window->details = g_new0 (NautilusWindowDetails, 1);
@@ -208,9 +190,6 @@ nautilus_window_instance_init (NautilusWindow *window)
 
 	gtk_quit_add_destroy (1, GTK_OBJECT (window));
 
-	/* Keep track of changes in enabled state of sidebar panels */
-	nautilus_sidebar_for_each_panel (add_sidebar_panel_callback, window);
-
 	/* Keep the main event loop alive as long as the window exists */
 	nautilus_main_event_loop_register (GTK_OBJECT (window));
 }
@@ -676,7 +655,7 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
 				      _("Information"));
 
 	/* Set up the sidebar panels. */
-	update_sidebar_panels_from_preferences (window);
+	add_sidebar_panels (window);
 	
 	gtk_widget_show (GTK_WIDGET (window->sidebar));
 }
@@ -1930,18 +1909,14 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 }
 
 /**
- * update_sidebar_panels_from_preferences:
+ * add_sidebar_panels:
  * @window:	A NautilusWindow
  *
- * Update the current list of sidebar panels from preferences.   
- *
- * Disabled panels are removed if they are already in the list.
- *
- * Enabled panels are added if they are not already in the list.
+ * Adds all sidebars available
  *
  */
 static void
-update_sidebar_panels_from_preferences (NautilusWindow *window)
+add_sidebar_panels (NautilusWindow *window)
 {
 	GList *identifier_list;
 
@@ -1951,25 +1926,11 @@ update_sidebar_panels_from_preferences (NautilusWindow *window)
 		return;
 	}
 
-	/* Obtain list of enabled view identifiers */
-	identifier_list = nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers ();
+	identifier_list = nautilus_sidebar_get_all_sidebar_panel_view_identifiers ();
 	nautilus_window_set_sidebar_panels (window, identifier_list);
 	nautilus_view_identifier_list_free (identifier_list);
 }
 
-/**
- * sidebar_panels_changed_callback:
- * @user_data:	Callback data
- *
- * Called when enabled/disabled preferences change for any
- * sidebar panel.
- */
-static void
-sidebar_panels_changed_callback (gpointer user_data)
-{
-	update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
-}
-
 static void 
 show_dock_item (NautilusWindow *window, const char *dock_item_path)
 {
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 4eb08d389..af87078b6 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -118,9 +118,8 @@ enum {
 static GList *history_list;
 static int side_pane_width_auto_value = SIDE_PANE_MINIMUM_WIDTH;
 
-static void update_sidebar_panels_from_preferences (NautilusWindow *window);
-static void sidebar_panels_changed_callback        (gpointer        user_data);
-static void cancel_view_as_callback                (NautilusWindow *window);
+static void add_sidebar_panels                  (NautilusWindow *window);
+static void cancel_view_as_callback             (NautilusWindow *window);
 
 GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
 			 BonoboWindow, BONOBO_TYPE_WINDOW)
@@ -156,23 +155,6 @@ set_up_default_icon_list (void)
 }
 
 static void
-add_sidebar_panel_callback (const char *name,
-			    const char *iid,
-			    const char *preference_key,
-			    gpointer callback_data) 
-{
-	g_assert (name != NULL);
-	g_assert (iid != NULL);
-	g_assert (preference_key != NULL);
-	g_assert (NAUTILUS_IS_WINDOW (callback_data));
-	
-	eel_preferences_add_callback_while_alive (preference_key,
-						  sidebar_panels_changed_callback,
-						  callback_data,
-						  G_OBJECT (callback_data));
-}
-
-static void
 nautilus_window_instance_init (NautilusWindow *window)
 {
 	window->details = g_new0 (NautilusWindowDetails, 1);
@@ -208,9 +190,6 @@ nautilus_window_instance_init (NautilusWindow *window)
 
 	gtk_quit_add_destroy (1, GTK_OBJECT (window));
 
-	/* Keep track of changes in enabled state of sidebar panels */
-	nautilus_sidebar_for_each_panel (add_sidebar_panel_callback, window);
-
 	/* Keep the main event loop alive as long as the window exists */
 	nautilus_main_event_loop_register (GTK_OBJECT (window));
 }
@@ -676,7 +655,7 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
 				      _("Information"));
 
 	/* Set up the sidebar panels. */
-	update_sidebar_panels_from_preferences (window);
+	add_sidebar_panels (window);
 	
 	gtk_widget_show (GTK_WIDGET (window->sidebar));
 }
@@ -1930,18 +1909,14 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 }
 
 /**
- * update_sidebar_panels_from_preferences:
+ * add_sidebar_panels:
  * @window:	A NautilusWindow
  *
- * Update the current list of sidebar panels from preferences.   
- *
- * Disabled panels are removed if they are already in the list.
- *
- * Enabled panels are added if they are not already in the list.
+ * Adds all sidebars available
  *
  */
 static void
-update_sidebar_panels_from_preferences (NautilusWindow *window)
+add_sidebar_panels (NautilusWindow *window)
 {
 	GList *identifier_list;
 
@@ -1951,25 +1926,11 @@ update_sidebar_panels_from_preferences (NautilusWindow *window)
 		return;
 	}
 
-	/* Obtain list of enabled view identifiers */
-	identifier_list = nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers ();
+	identifier_list = nautilus_sidebar_get_all_sidebar_panel_view_identifiers ();
 	nautilus_window_set_sidebar_panels (window, identifier_list);
 	nautilus_view_identifier_list_free (identifier_list);
 }
 
-/**
- * sidebar_panels_changed_callback:
- * @user_data:	Callback data
- *
- * Called when enabled/disabled preferences change for any
- * sidebar panel.
- */
-static void
-sidebar_panels_changed_callback (gpointer user_data)
-{
-	update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
-}
-
 static void 
 show_dock_item (NautilusWindow *window, const char *dock_item_path)
 {
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 4eb08d389..af87078b6 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -118,9 +118,8 @@ enum {
 static GList *history_list;
 static int side_pane_width_auto_value = SIDE_PANE_MINIMUM_WIDTH;
 
-static void update_sidebar_panels_from_preferences (NautilusWindow *window);
-static void sidebar_panels_changed_callback        (gpointer        user_data);
-static void cancel_view_as_callback                (NautilusWindow *window);
+static void add_sidebar_panels                  (NautilusWindow *window);
+static void cancel_view_as_callback             (NautilusWindow *window);
 
 GNOME_CLASS_BOILERPLATE (NautilusWindow, nautilus_window,
 			 BonoboWindow, BONOBO_TYPE_WINDOW)
@@ -156,23 +155,6 @@ set_up_default_icon_list (void)
 }
 
 static void
-add_sidebar_panel_callback (const char *name,
-			    const char *iid,
-			    const char *preference_key,
-			    gpointer callback_data) 
-{
-	g_assert (name != NULL);
-	g_assert (iid != NULL);
-	g_assert (preference_key != NULL);
-	g_assert (NAUTILUS_IS_WINDOW (callback_data));
-	
-	eel_preferences_add_callback_while_alive (preference_key,
-						  sidebar_panels_changed_callback,
-						  callback_data,
-						  G_OBJECT (callback_data));
-}
-
-static void
 nautilus_window_instance_init (NautilusWindow *window)
 {
 	window->details = g_new0 (NautilusWindowDetails, 1);
@@ -208,9 +190,6 @@ nautilus_window_instance_init (NautilusWindow *window)
 
 	gtk_quit_add_destroy (1, GTK_OBJECT (window));
 
-	/* Keep track of changes in enabled state of sidebar panels */
-	nautilus_sidebar_for_each_panel (add_sidebar_panel_callback, window);
-
 	/* Keep the main event loop alive as long as the window exists */
 	nautilus_main_event_loop_register (GTK_OBJECT (window));
 }
@@ -676,7 +655,7 @@ nautilus_window_set_up_sidebar (NautilusWindow *window)
 				      _("Information"));
 
 	/* Set up the sidebar panels. */
-	update_sidebar_panels_from_preferences (window);
+	add_sidebar_panels (window);
 	
 	gtk_widget_show (GTK_WIDGET (window->sidebar));
 }
@@ -1930,18 +1909,14 @@ nautilus_window_set_content_view_widget (NautilusWindow *window,
 }
 
 /**
- * update_sidebar_panels_from_preferences:
+ * add_sidebar_panels:
  * @window:	A NautilusWindow
  *
- * Update the current list of sidebar panels from preferences.   
- *
- * Disabled panels are removed if they are already in the list.
- *
- * Enabled panels are added if they are not already in the list.
+ * Adds all sidebars available
  *
  */
 static void
-update_sidebar_panels_from_preferences (NautilusWindow *window)
+add_sidebar_panels (NautilusWindow *window)
 {
 	GList *identifier_list;
 
@@ -1951,25 +1926,11 @@ update_sidebar_panels_from_preferences (NautilusWindow *window)
 		return;
 	}
 
-	/* Obtain list of enabled view identifiers */
-	identifier_list = nautilus_sidebar_get_enabled_sidebar_panel_view_identifiers ();
+	identifier_list = nautilus_sidebar_get_all_sidebar_panel_view_identifiers ();
 	nautilus_window_set_sidebar_panels (window, identifier_list);
 	nautilus_view_identifier_list_free (identifier_list);
 }
 
-/**
- * sidebar_panels_changed_callback:
- * @user_data:	Callback data
- *
- * Called when enabled/disabled preferences change for any
- * sidebar panel.
- */
-static void
-sidebar_panels_changed_callback (gpointer user_data)
-{
-	update_sidebar_panels_from_preferences (NAUTILUS_WINDOW (user_data));
-}
-
 static void 
 show_dock_item (NautilusWindow *window, const char *dock_item_path)
 {