summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-09-05 15:11:30 +0200
committerStefano Karapetsas <[email protected]>2012-09-05 15:11:30 +0200
commit5164b9fd8c316da50ec10ef944c389dc98f140dd (patch)
tree20662487dcbc7bbadbe2dbde150b6413060af48a
parent3f9a8ff95dd0632f52ecdbe4067fffd7b3c0df20 (diff)
downloadcaja-5164b9fd8c316da50ec10ef944c389dc98f140dd.tar.bz2
caja-5164b9fd8c316da50ec10ef944c389dc98f140dd.tar.xz
convert install-mime-activation to gsettings
-rw-r--r--libcaja-private/caja-global-preferences.c5
-rw-r--r--libcaja-private/caja-global-preferences.h2
-rw-r--r--libcaja-private/caja-mime-actions.c2
3 files changed, 2 insertions, 7 deletions
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index c690c61f..69ddefa3 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -228,11 +228,6 @@ static const PreferenceDefault preference_defaults[] =
"speed_tradeoff"
},
{
- CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION,
- PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (TRUE)
- },
- {
CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
PREFERENCE_STRING,
"local_only",
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index ef4ae2ba..6d149747 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -100,7 +100,7 @@ G_BEGIN_DECLS
#define CAJA_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "executable-text-activation"
/* Installing new packages when unknown mime type activated */
-#define CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION "preferences/install_mime_activation"
+#define CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION "install-mime-activation"
/* Spatial or browser mode */
#define CAJA_PREFERENCES_ALWAYS_USE_BROWSER "always-use-browser"
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 4679d920..501263f0 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -1610,7 +1610,7 @@ application_unhandled_uri (ActivateParameters *parameters, char *uri)
#ifdef ENABLE_PACKAGEKIT
/* allow an admin to disable the PackageKit search functionality */
- show_install_mime = eel_preferences_get_boolean (CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION);
+ show_install_mime = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_INSTALL_MIME_ACTIVATION);
#else
/* we have no install functionality */
show_install_mime = FALSE;