diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-11-26 10:33:51 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-11-27 14:54:35 +0100 |
| commit | 5cea9b09ea46a8ee6a20458150bd1e6556e05089 (patch) | |
| tree | 10020e31e1de0cd3c757786905581a952deb8185 | |
| parent | f67f8b4bc800d0096f26443fcd815675466e2b7f (diff) | |
| download | nautilus-5cea9b09ea46a8ee6a20458150bd1e6556e05089.tar.gz | |
Ensure show-hidden-files UI is uptodate
When we read the per-location show-hidden-files setting, also
update the UI.
Fixes bug #568089.
(cherry picked from commit 5b1159927b98b569fcb22f05986a140a7c42ba0a)
| -rw-r--r-- | src/nautilus-window-manage-views.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 24e930209..76fdcc48b 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -885,6 +885,7 @@ setup_new_spatial_window (NautilusWindowSlot *slot, NautilusFile *file) char *geometry_string; char *scroll_string; gboolean maximized, sticky, above; + GtkAction *action; window = slot->window; @@ -895,15 +896,22 @@ setup_new_spatial_window (NautilusWindowSlot *slot, NautilusFile *file) NULL); if (show_hidden_file_setting != NULL) { if (strcmp (show_hidden_file_setting, "1") == 0) { - NAUTILUS_WINDOW (window)->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_ENABLE; + window->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_ENABLE; } else { - NAUTILUS_WINDOW (window)->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DISABLE; + window->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DISABLE; } + + /* Update the UI, since we initialize it to the default */ + action = gtk_action_group_get_action (window->details->main_action_group, NAUTILUS_ACTION_SHOW_HIDDEN_FILES); + gtk_action_block_activate (action); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + window->details->show_hidden_files_mode == NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_ENABLE); + gtk_action_unblock_activate (action); } else { NAUTILUS_WINDOW (window)->details->show_hidden_files_mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DEFAULT; } g_free (show_hidden_file_setting); - + /* load the saved window geometry */ maximized = nautilus_file_get_boolean_metadata (file, NAUTILUS_METADATA_KEY_WINDOW_MAXIMIZED, FALSE); |