Commit c8ded383 by Holger Berndt Committed by Alexander Larsson

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.
parent 0b6dd131
......@@ -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>
......
......@@ -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,
""
......
......@@ -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"
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment