[nautilus] Convert install-mime-activation to gsettings
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Convert install-mime-activation to gsettings
- Date: Fri, 23 Jul 2010 10:33:03 +0000 (UTC)
commit adee5018f3a4985cf8d538a998f32ed9bb6a6ffd
Author: Alexander Larsson <alexl redhat com>
Date: Thu Jul 22 16:47:25 2010 +0200
Convert install-mime-activation to gsettings
libnautilus-private/nautilus-global-preferences.c | 4 ----
libnautilus-private/nautilus-global-preferences.h | 2 +-
libnautilus-private/nautilus-mime-actions.c | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 4d6744d..179e174 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -214,10 +214,6 @@ static const PreferenceDefault preference_defaults[] = {
NULL, NULL,
"speed_tradeoff"
},
- { NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION,
- PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (TRUE)
- },
{ NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
PREFERENCE_STRING,
"local_only",
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 5fb4c57..152df6e 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -99,7 +99,7 @@ typedef enum
#define NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "executable-text-activation"
/* Installing new packages when unknown mime type activated */
-#define NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION "preferences/install_mime_activation"
+#define NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION "install-mime-activation"
/* Spatial or browser mode */
#define NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER "always-use-browser"
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index d51183e..fb39956 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -1488,7 +1488,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 (NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION);
+ show_install_mime = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_INSTALL_MIME_ACTIVATION);
#else
/* we have no install functionality */
show_install_mime = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]