diff options
| author | Balló György <[email protected]> | 2014-10-03 00:20:05 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-10-03 08:31:39 +0200 |
| commit | ac5bfbfd01210309674bd946f09f576773d06917 (patch) | |
| tree | 7004916d766356cf181f43565ca5e2fb5b8ca6f8 /capplets/common | |
| parent | d76fe8f9c85557ee767fd15fb692f3820ebb5610 (diff) | |
| download | mate-control-center-ac5bfbfd01210309674bd946f09f576773d06917.tar.bz2 mate-control-center-ac5bfbfd01210309674bd946f09f576773d06917.tar.xz | |
Use Caja GSettings schema optionally
This makes Caja dependency optional. Disable desktop font setting if no Caja present.
Closes https://github.com/mate-desktop/mate-control-center/pull/119
Diffstat (limited to 'capplets/common')
| -rw-r--r-- | capplets/common/mate-theme-apply.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/capplets/common/mate-theme-apply.c b/capplets/common/mate-theme-apply.c index 4489b302..df5a8953 100644 --- a/capplets/common/mate-theme-apply.c +++ b/capplets/common/mate-theme-apply.c @@ -23,6 +23,7 @@ #include <string.h> #include <gio/gio.h> +#include <libmate-desktop/mate-gsettings.h> #include "mate-theme-apply.h" #include "gtkrc-utils.h" @@ -52,9 +53,6 @@ mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info) GSettings *marco_settings; GSettings *mouse_settings; GSettings *notification_settings = NULL; - const char * const *schemas; - gboolean schema_exists; - gint i; gchar *old_key; gint old_key_int; @@ -62,20 +60,10 @@ mate_meta_theme_set (MateThemeMetaInfo *meta_theme_info) marco_settings = g_settings_new (MARCO_SCHEMA); mouse_settings = g_settings_new (MOUSE_SCHEMA); - /* We need this because mate-control-center does not depend on mate-notification-daemon, - * and if we try to get notification theme without schema installed, gsettings crashes - * see https://bugzilla.gnome.org/show_bug.cgi?id=651225 */ - schemas = g_settings_list_schemas (); - schema_exists = FALSE; - for (i = 0; schemas[i] != NULL; i++) { - if (g_strcmp0 (schemas[i], NOTIFICATION_SCHEMA) == 0) { - schema_exists = TRUE; - break; - } - } - if (schema_exists == TRUE) { + if (mate_gsettings_schema_exists (NOTIFICATION_SCHEMA)) + { notification_settings = g_settings_new (NOTIFICATION_SCHEMA); - } + } /* Set the gtk+ key */ old_key = g_settings_get_string (interface_settings, GTK_THEME_KEY); |