diff options
| author | Stefano Karapetsas <[email protected]> | 2012-09-05 14:44:07 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-09-05 14:44:07 +0200 |
| commit | b10e30db918ff889bb06540e129b3f31b2815da2 (patch) | |
| tree | d98d7640c4275e4d6496f54926b580e59b9253b7 /libcaja-private | |
| parent | f82a305cde0842e53d7468ce37b4cd02161838c5 (diff) | |
| download | caja-b10e30db918ff889bb06540e129b3f31b2815da2.tar.bz2 caja-b10e30db918ff889bb06540e129b3f31b2815da2.tar.xz | |
convert click-policy to gsettings
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-global-preferences.c | 24 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 2 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 7 |
3 files changed, 5 insertions, 28 deletions
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index 00c1e743..e00f42fe 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -104,20 +104,6 @@ static EelEnumerationEntry file_size_enum_entries[] = { "4294967295", N_("4 GB"), 4294967295U } }; -static EelEnumerationEntry click_policy_enum_entries[] = -{ - { - "single", - N_("Activate items with a _single click"), - CAJA_CLICK_POLICY_SINGLE - }, - { - "double", - N_("Activate items with a _double click"), - CAJA_CLICK_POLICY_DOUBLE - } -}; - static EelEnumerationEntry search_bar_type_enum_entries[] = { { @@ -254,13 +240,6 @@ static const PreferenceDefault preference_defaults[] = "speed_tradeoff" }, { - CAJA_PREFERENCES_CLICK_POLICY, - PREFERENCE_STRING, - "double", - NULL, NULL, - "click_policy" - }, - { CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION, PREFERENCE_BOOLEAN, GINT_TO_POINTER (TRUE) @@ -569,9 +548,6 @@ global_preferences_register_enumerations (void) * populate widgets and route preferences changes between the * storage (MateConf) and the displayed values. */ - eel_enumeration_register ("click_policy", - click_policy_enum_entries, - G_N_ELEMENTS (click_policy_enum_entries)); eel_enumeration_register ("default_folder_viewer", default_folder_viewer_enum_entries, G_N_ELEMENTS (default_folder_viewer_enum_entries)); diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 45efde91..bb24de7a 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -94,7 +94,7 @@ G_BEGIN_DECLS #define CAJA_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES "sidebar_panels/tree/show_only_directories" /* Single/Double click preference */ -#define CAJA_PREFERENCES_CLICK_POLICY "preferences/click_policy" +#define CAJA_PREFERENCES_CLICK_POLICY "click-policy" /* Activating executable text files */ #define CAJA_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "executable-text-activation" diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index c96cd6ef..db0b5280 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -283,9 +283,10 @@ caja_icon_canvas_item_init (CajaIconCanvasItem *icon_item) if (!setup_auto_enums) { - eel_preferences_add_auto_enum - (CAJA_PREFERENCES_CLICK_POLICY, - &click_policy_auto_value); + eel_g_settings_add_auto_enum + (caja_preferences, + CAJA_PREFERENCES_CLICK_POLICY, + &click_policy_auto_value); setup_auto_enums = TRUE; } |