diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-08-23 01:00:32 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-08-23 01:03:33 +0200 |
| commit | c2847953b2fea4dcb6fdd1fbc7b9d860dd658dc8 (patch) | |
| tree | dfd2420168016e5f909e3612bca643120b9b17db /libnautilus-private | |
| parent | 0216ce9d694dc1b2690f7245cbc9f7374b71452f (diff) | |
| download | nautilus-c2847953b2fea4dcb6fdd1fbc7b9d860dd658dc8.tar.gz | |
window: delegate view mode to slot
Delefate the view management to the slot.
Also on the way, remove duplicates of views ID.
This patch is another step forward to full isolation of
window/slot/view
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.c | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index 75afe0fd7..15d8f808e 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -27,6 +27,7 @@ #include "nautilus-file-utilities.h" #include "nautilus-file.h" +#include "src/nautilus-files-view.h" #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-stock-dialogs.h> @@ -57,9 +58,9 @@ nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void) g_settings_get_enum (nautilus_preferences, NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER); if (preference_value == NAUTILUS_DEFAULT_FOLDER_VIEWER_LIST_VIEW) { - viewer_iid = NAUTILUS_LIST_VIEW_IID; + viewer_iid = NAUTILUS_LIST_VIEW_ID; } else { - viewer_iid = NAUTILUS_CANVAS_VIEW_IID; + viewer_iid = NAUTILUS_CANVAS_VIEW_ID; } return g_strdup (viewer_iid); diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index ef9dfbfc3..d3204751b 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -82,11 +82,6 @@ enum NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER }; -/* These IIDs are used by the preferences code and in nautilus-application.c */ -#define NAUTILUS_CANVAS_VIEW_IID "OAFIID:Nautilus_File_Manager_Canvas_View" -#define NAUTILUS_LIST_VIEW_IID "OAFIID:Nautilus_File_Manager_List_View" - - /* Icon View */ #define NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level" |