Merge pull request #1146 from ittner/fix-color-scheme-support-across-des

Fix color scheme support across desktop environments

Author: lwindolf

src/conf.c

@@ -81,19 +81,24 @@ conf_get_dark_theme (void)
 	if (fdo_settings) {
 		gint scheme;
 
-		conf_get_int_value_from_schema (fdo_settings, "color-scheme", &scheme);
-		debug1 (DEBUG_CONF, "FDO reports color-schema code '%d'", scheme);
-		if (1 == scheme)
-			dark = FALSE;
-		if (0 == scheme && 2 == scheme)
-			dark = TRUE;
+		if (conf_schema_has_key (fdo_settings, "color-scheme")) {
+			conf_get_int_value_from_schema (fdo_settings, "color-scheme", &scheme);
+			debug1 (DEBUG_CONF, "FDO reports color-schema code '%d'", scheme);
+			if (1 == scheme)
+				dark = FALSE;
+			if (0 == scheme || 2 == scheme)
+				dark = TRUE;
+		}
 	} else {
 		gchar *scheme = NULL;
 
-		conf_get_str_value_from_schema (desktop_settings, "color-scheme", &scheme);
-		if (scheme) {
-			debug1 (DEBUG_CONF, "GNOME reports color-schema '%s'", scheme);
-			dark = g_str_equal (scheme, "prefer-dark");
+		if (conf_schema_has_key (desktop_settings, "color-scheme")) {
+			conf_get_str_value_from_schema (desktop_settings, "color-scheme", &scheme);
+			if (scheme) {
+				debug1 (DEBUG_CONF, "GNOME reports color-schema '%s'", scheme);
+				dark = g_str_equal (scheme, "prefer-dark");
+				g_free (scheme);
+			}
 		}
 	}
 
@@ -225,6 +230,23 @@ conf_get_toolbar_style(void)
 	return style;
 }
 
+gboolean
+conf_schema_has_key (GSettings *gsettings, const gchar *key)
+{
+	g_assert (gsettings != NULL);
+	g_assert (key != NULL);
+
+	GSettingsSchema *schema = NULL;
+	gboolean has_key = FALSE;
+
+	g_object_get (gsettings, "settings-schema", &schema, NULL);
+	if (schema) {
+		has_key = g_settings_schema_has_key (schema, key);
+		g_settings_schema_unref (schema);
+	}
+	return has_key;
+}
+
 gboolean
 conf_get_bool_value_from_schema (GSettings *gsettings, const gchar *key, gboolean *value)
 {

src/conf.h

@@ -95,6 +95,17 @@ void	conf_deinit (void);
 #define conf_get_strv_value(key, value) conf_get_strv_value_from_schema (NULL, key, value)
 #define conf_get_int_value(key, value) conf_get_int_value_from_schema (NULL, key, value)
 
+
+/**
+ * Returns true if the key is defined in the schema for the given gsettings.
+ *
+ * @param gsettings	gsettings schema to use
+ * @param key	the configuration key
+ *
+ * @returns TRUE if the configuration key is defined
+ */
+gboolean conf_schema_has_key (GSettings *gsettings, const gchar *key);
+
 /**
  * Retrieves the value of the given boolean configuration key.
  *