summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-global-preferences.h
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-29 19:39:28 +0200
committerJasmine Hassan <[email protected]>2012-12-03 21:15:16 +0200
commit01c34579453893b76849400c9375dcc67c44622f (patch)
tree38ec0ab84f3effe6017c2b3989905b9f127bc1fe /libcaja-private/caja-global-preferences.h
parent532fbb1ce6bf446c8c5e40f8a49abc3e450a65d0 (diff)
downloadcaja-01c34579453893b76849400c9375dcc67c44622f.tar.bz2
caja-01c34579453893b76849400c9375dcc67c44622f.tar.xz
[global-prefs|application] use MATE global 'show-desktop-icons' setting
instead of a local-to-caja setting 'show-desktop' This key would indicate that file managers (by default Caja, but applies to others like Thunar or ROX) should handle desktop, i.e. draw a background and place icons there. Otherwise (when false), mate-settings-daemon will take over drawing desktop background. This is different from 'draw-background', which is a separate option used only for drawing background without icons (by mate-settings-daemon). To Caja, 'show-desktop-icons' implies 'draw-background', and so if set to false, Caja won't (needlessly) draw the desktop. However, if the user uses the "Background & Emblems dialog" to drop an image-pattern/color/reset on the desktop, Caja will again draw the desktop. For reference: https://bugzilla.gnome.org/show_bug.cgi?id=632225
Diffstat (limited to 'libcaja-private/caja-global-preferences.h')
-rw-r--r--libcaja-private/caja-global-preferences.h106
1 files changed, 52 insertions, 54 deletions
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index 0430a016..85fbe75f 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -30,79 +30,77 @@
G_BEGIN_DECLS
- /* Whether exit when last window destroyed */
-#define CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW "exit-with-last-window"
-
- /* Desktop Background options */
-#define CAJA_PREFERENCES_BACKGROUND_SET "background-set"
-#define CAJA_PREFERENCES_BACKGROUND_COLOR "background-color"
-#define CAJA_PREFERENCES_BACKGROUND_URI "background-uri"
-
- /* Side Pane Background options */
-#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_SET "side-pane-background-set"
-#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_COLOR "side-pane-background-color"
-#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_URI "side-pane-background-uri"
-
- /* Automount options */
-#define CAJA_PREFERENCES_MEDIA_AUTOMOUNT "automount"
-#define CAJA_PREFERENCES_MEDIA_AUTOMOUNT_OPEN "automount-open"
-
- /* Autorun options */
-#define CAJA_PREFERENCES_MEDIA_AUTORUN_NEVER "autorun-never"
-#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP "autorun-x-content-start-app"
-#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE "autorun-x-content-ignore"
-#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER "autorun-x-content-open-folder"
-
- /* Trash options */
+/* Whether exit when last window destroyed */
+#define CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW "exit-with-last-window"
+
+/* Desktop Background options */
+#define CAJA_PREFERENCES_BACKGROUND_SET "background-set"
+#define CAJA_PREFERENCES_BACKGROUND_COLOR "background-color"
+#define CAJA_PREFERENCES_BACKGROUND_URI "background-uri"
+
+/* Side Pane Background options */
+#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_SET "side-pane-background-set"
+#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_COLOR "side-pane-background-color"
+#define CAJA_PREFERENCES_SIDE_PANE_BACKGROUND_URI "side-pane-background-uri"
+
+/* Automount options */
+#define CAJA_PREFERENCES_MEDIA_AUTOMOUNT "automount"
+#define CAJA_PREFERENCES_MEDIA_AUTOMOUNT_OPEN "automount-open"
+
+/* Autorun options */
+#define CAJA_PREFERENCES_MEDIA_AUTORUN_NEVER "autorun-never"
+#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP "autorun-x-content-start-app"
+#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE "autorun-x-content-ignore"
+#define CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER "autorun-x-content-open-folder"
+
+/* Trash options */
#define CAJA_PREFERENCES_CONFIRM_TRASH "confirm-trash"
#define CAJA_PREFERENCES_ENABLE_DELETE "enable-delete"
- /* Desktop options */
-#define CAJA_PREFERENCES_SHOW_DESKTOP "show-desktop"
-#define CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR "desktop-is-home-dir"
+/* Desktop options */
+#define CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR "desktop-is-home-dir"
- /* Display */
+/* Display */
#define CAJA_PREFERENCES_SHOW_HIDDEN_FILES "show-hidden-files"
#define CAJA_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "show-advanced-permissions"
-#define CAJA_PREFERENCES_DATE_FORMAT "date-format"
+#define CAJA_PREFERENCES_DATE_FORMAT "date-format"
- /* Mouse */
+/* Mouse */
#define CAJA_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "mouse-use-extra-buttons"
#define CAJA_PREFERENCES_MOUSE_FORWARD_BUTTON "mouse-forward-button"
-#define CAJA_PREFERENCES_MOUSE_BACK_BUTTON "mouse-back-button"
-
- typedef enum
- {
- CAJA_DATE_FORMAT_LOCALE,
- CAJA_DATE_FORMAT_ISO,
- CAJA_DATE_FORMAT_INFORMAL
- }
- CajaDateFormat;
-
- typedef enum
- {
- CAJA_NEW_TAB_POSITION_AFTER_CURRENT_TAB,
- CAJA_NEW_TAB_POSITION_END,
- } CajaNewTabPosition;
-
- /* Sidebar panels */
+#define CAJA_PREFERENCES_MOUSE_BACK_BUTTON "mouse-back-button"
+
+typedef enum
+{
+ CAJA_DATE_FORMAT_LOCALE,
+ CAJA_DATE_FORMAT_ISO,
+ CAJA_DATE_FORMAT_INFORMAL
+} CajaDateFormat;
+
+typedef enum
+{
+ CAJA_NEW_TAB_POSITION_AFTER_CURRENT_TAB,
+ CAJA_NEW_TAB_POSITION_END,
+} CajaNewTabPosition;
+
+/* Sidebar panels */
#define CAJA_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES "show-only-directories"
- /* Single/Double click preference */
+/* Single/Double click preference */
#define CAJA_PREFERENCES_CLICK_POLICY "click-policy"
- /* Activating executable text files */
+/* Activating executable text files */
#define CAJA_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "executable-text-activation"
- /* Installing new packages when unknown mime type activated */
+/* Installing new packages when unknown mime type activated */
#define CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION "install-mime-activation"
- /* Spatial or browser mode */
+/* Spatial or browser mode */
#define CAJA_PREFERENCES_ALWAYS_USE_BROWSER "always-use-browser"
#define CAJA_PREFERENCES_NEW_TAB_POSITION "tabs-open-position"
#define CAJA_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY "always-use-location-entry"
- /* Which views should be displayed for new windows */
+/* Which views should be displayed for new windows */
#define CAJA_WINDOW_STATE_START_WITH_LOCATION_BAR "start-with-location-bar"
#define CAJA_WINDOW_STATE_START_WITH_STATUS_BAR "start-with-status-bar"
#define CAJA_WINDOW_STATE_START_WITH_SIDEBAR "start-with-sidebar"
@@ -112,12 +110,12 @@ G_BEGIN_DECLS
#define CAJA_WINDOW_STATE_MAXIMIZED "maximized"
#define CAJA_WINDOW_STATE_SIDEBAR_WIDTH "sidebar-width"
- /* Sorting order */
+/* Sorting order */
#define CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST "sort-directories-first"
#define CAJA_PREFERENCES_DEFAULT_SORT_ORDER "default-sort-order"
#define CAJA_PREFERENCES_DEFAULT_SORT_IN_REVERSE_ORDER "default-sort-in-reverse-order"
- /* The default folder viewer - one of the two enums below */
+/* The default folder viewer - one of the two enums below */
#define CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER "default-folder-viewer"
enum