summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-09-05 15:07:40 +0200
committerStefano Karapetsas <[email protected]>2012-09-05 15:07:40 +0200
commitf0ef6466ec0987807fcffdd41b09e88fc1292802 (patch)
treeb8e0590ff10422b92989deff306e2c559c1077ba
parentab3a27b67b830897c49ecf395ee5e63e4dfdfc26 (diff)
downloadcaja-f0ef6466ec0987807fcffdd41b09e88fc1292802.tar.bz2
caja-f0ef6466ec0987807fcffdd41b09e88fc1292802.tar.xz
convert new tab position to gsettings
-rw-r--r--libcaja-private/caja-global-preferences.c17
-rw-r--r--libcaja-private/caja-global-preferences.h2
-rw-r--r--libcaja-private/caja-mime-actions.c2
-rw-r--r--src/caja-navigation-window-menus.c2
-rw-r--r--src/caja-window-manage-views.c2
5 files changed, 4 insertions, 21 deletions
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index 5136bb2a..85eb2827 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -149,13 +149,6 @@ static EelEnumerationEntry standard_font_size_entries[] =
{ "24", N_("24"), 24 }
};
-/* These are not translated, because the text is not used in the ui */
-static EelEnumerationEntry new_tab_position_entries[] =
-{
- { "after_current_tab", "After Current Tab", CAJA_NEW_TAB_POSITION_AFTER_CURRENT_TAB },
- { "end", "End", CAJA_NEW_TAB_POSITION_END }
-};
-
/*
* A callback which can be used to fetch dynamic fallback values.
* For example, values that are dependent on the environment (such as user name)
@@ -285,13 +278,6 @@ static const PreferenceDefault preference_defaults[] =
NULL
},
{
- CAJA_PREFERENCES_NEW_TAB_POSITION,
- PREFERENCE_STRING,
- "after_current_tab",
- NULL, NULL,
- "new_tab_position"
- },
- {
CAJA_PREFERENCES_START_WITH_TOOLBAR,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
@@ -564,9 +550,6 @@ global_preferences_register_enumerations (void)
eel_enumeration_register ("standard_font_size",
standard_font_size_entries,
G_N_ELEMENTS (standard_font_size_entries));
- eel_enumeration_register ("new_tab_position",
- new_tab_position_entries,
- G_N_ELEMENTS (new_tab_position_entries));
/* Set the enumeration ids for preferences that need them */
for (i = 0; preference_defaults[i].name != NULL; i++)
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index 03130d84..82cb033e 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -104,7 +104,7 @@ G_BEGIN_DECLS
/* Spatial or browser mode */
#define CAJA_PREFERENCES_ALWAYS_USE_BROWSER "always-use-browser"
-#define CAJA_PREFERENCES_NEW_TAB_POSITION "preferences/tabs_open_position"
+#define CAJA_PREFERENCES_NEW_TAB_POSITION "tabs-open-position"
/* Which views should be displayed for new windows */
#define CAJA_PREFERENCES_START_WITH_LOCATION_BAR "preferences/start_with_location_bar"
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 9cbc2f45..4679d920 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -1936,7 +1936,7 @@ activate_files (ActivateParameters *parameters)
{
if ((flags & CAJA_WINDOW_OPEN_FLAG_NEW_TAB) != 0 &&
- eel_preferences_get_enum (CAJA_PREFERENCES_NEW_TAB_POSITION) ==
+ g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_NEW_TAB_POSITION) ==
CAJA_NEW_TAB_POSITION_AFTER_CURRENT_TAB)
{
/* When inserting N tabs after the current one,
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index 033bfaa0..69caca50 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.c
@@ -637,7 +637,7 @@ action_new_tab_callback (GtkAction *action,
{
flags = 0;
- new_slot_position = eel_preferences_get_enum (CAJA_PREFERENCES_NEW_TAB_POSITION);
+ new_slot_position = g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_NEW_TAB_POSITION);
if (new_slot_position == CAJA_NEW_TAB_POSITION_END)
{
flags = CAJA_WINDOW_OPEN_SLOT_APPEND;
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
index 980c780c..35091bed 100644
--- a/src/caja-window-manage-views.c
+++ b/src/caja-window-manage-views.c
@@ -636,7 +636,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
slot_flags = 0;
- new_slot_position = eel_preferences_get_enum (CAJA_PREFERENCES_NEW_TAB_POSITION);
+ new_slot_position = g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_NEW_TAB_POSITION);
if (new_slot_position == CAJA_NEW_TAB_POSITION_END)
{
slot_flags = CAJA_WINDOW_OPEN_SLOT_APPEND;