[nautilus] Don't remember status of extra pane in a gconf key

[Alexander Larsson <alexl src gnome org>]

commit c8ded383147e0f860f9a206e9f45606bf16effe9
Author: Holger Berndt <berndth gmx de>
Date:   Thu Feb 25 22:55:40 2010 +0100

    Don't remember status of extra pane in a gconf key
    
    The focus for Nautilus' split view mode are occasional, temporary
    switches to a split view mode for heavy-duty filebrowsing, not to
    be a permanent double pane filemanager. Therefore, neither split-view
    toggle status nor splitter position of a window are supposed to affect
    subsequently opened windows. See comments at bug 608431.

 .../apps_nautilus_preferences.schemas.in           |   15 ---------------
 libnautilus-private/nautilus-global-preferences.c  |    4 ----
 libnautilus-private/nautilus-global-preferences.h  |    1 -
 src/nautilus-navigation-window.c                   |   16 ----------------
 4 files changed, 0 insertions(+), 36 deletions(-)
---
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index d6e8cf8..db24964 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -995,21 +995,6 @@ most cases, this should be left alone. -->Sans 10</default>
     </schema>
 
     <schema>
-      <key>/schemas/apps/nautilus/preferences/start_with_extra_pane</key>
-      <applyto>/apps/nautilus/preferences/start_with_extra_pane</applyto>
-      <owner>nautilus</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Show extra pane in new windows</short>
-         <long>
-           If set to true, newly opened windows will have the extra
-	   pane visible.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/nautilus/preferences/side_pane_view</key>
       <applyto>/apps/nautilus/preferences/side_pane_view</applyto>
       <owner>nautilus</owner>
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 5bad7e3..b3f0fc8 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -373,10 +373,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  PREFERENCE_BOOLEAN,
 	  GINT_TO_POINTER (TRUE)
 	},
-	{ NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (FALSE)
-	},
 	{ NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY,
 	  PREFERENCE_STRING,
 	  ""
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index dab5741..eda7c18 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -114,7 +114,6 @@ typedef enum
 #define NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR		"preferences/start_with_status_bar"
 #define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR		 	"preferences/start_with_sidebar"
 #define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR			"preferences/start_with_toolbar"
-#define NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE              "preferences/start_with_extra_pane"
 #define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW                     "preferences/side_pane_view"
 #define NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_SAVED_GEOMETRY 	"preferences/navigation_window_saved_geometry"
 #define NAUTILUS_PREFERENCES_NAVIGATION_WINDOW_MAXIMIZED        "preferences/navigation_window_saved_maximized"
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 6b85de5..a852656 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -127,7 +127,6 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	GtkWidget *toolbar;
 	NautilusWindow *win;
 	NautilusNavigationWindowPane *pane;
-	NautilusWindowSlot *slot;
 	GtkWidget *hpaned;
 	GtkWidget *vbox;
 
@@ -173,10 +172,6 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 
 	nautilus_navigation_window_initialize_actions (window);
 
-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE)) {
-		slot = create_extra_pane (window);
-	}
-
 	nautilus_navigation_window_initialize_menus (window);
 
 	ui_manager = nautilus_window_get_ui_manager (NAUTILUS_WINDOW (window));
@@ -1284,12 +1279,6 @@ nautilus_navigation_window_split_view_on (NautilusNavigationWindow *window)
 	} else {
 		nautilus_navigation_window_pane_hide_location_bar (pane, TRUE);
 	}
-
-	/* remember in gconf */
-	if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE) &&
-	    !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE)) {
-		eel_preferences_set_boolean (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE, TRUE);
-	}
 }
 
 void
@@ -1315,11 +1304,6 @@ nautilus_navigation_window_split_view_off (NautilusNavigationWindow *window)
 	}
 
 	nautilus_navigation_window_update_show_hide_menu_items (window);
-	/* remember in gconf */
-	if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE) &&
-	    eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE)) {
-		eel_preferences_set_boolean (NAUTILUS_PREFERENCES_START_WITH_EXTRA_PANE, FALSE);
-	}
 }
 
 gboolean