summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-01-23 07:48:26 -0500
committerMatthias Clasen <mclasen@redhat.com>2013-01-23 07:48:26 -0500
commitdb986ddc4f2b537787e8831b90cde9129a39a439 (patch)
tree82d8dfaa211dd08696e0e5d48a4d306dc56bebc7
parentdc8b67de9213c1d652603bcacb569b208e897625 (diff)
downloadgtk+-db986ddc4f2b537787e8831b90cde9129a39a439.tar.gz
color chooser: give GSettings schema a path
The code is always instantiating this schema at a fixed location, so why is it relocatable? Add a path so that it shows up properly in dconf-editor, and from the gsettings commandline tool.
-rw-r--r--gtk/gtkcolorchooserwidget.c3
-rw-r--r--gtk/org.gtk.Settings.ColorChooser.gschema.xml2
2 files changed, 2 insertions, 3 deletions
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 896a8f70f8..be954a2668 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -526,8 +526,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
gtk_color_swatch_set_icon (GTK_COLOR_SWATCH (button), "list-add-symbolic");
gtk_container_add (GTK_CONTAINER (box), button);
- cc->priv->settings = g_settings_new_with_path ("org.gtk.Settings.ColorChooser",
- "/org/gtk/settings/color-chooser/");
+ cc->priv->settings = g_settings_new ("org.gtk.Settings.ColorChooser");
variant = g_settings_get_value (cc->priv->settings, "custom-colors");
g_variant_iter_init (&iter, variant);
i = 0;
diff --git a/gtk/org.gtk.Settings.ColorChooser.gschema.xml b/gtk/org.gtk.Settings.ColorChooser.gschema.xml
index f707e469f0..57120569fe 100644
--- a/gtk/org.gtk.Settings.ColorChooser.gschema.xml
+++ b/gtk/org.gtk.Settings.ColorChooser.gschema.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
- <schema id='org.gtk.Settings.ColorChooser'>
+ <schema id='org.gtk.Settings.ColorChooser' path='/org/gtk/settings/color-chooser/'>
<key name='custom-colors' type='a(dddd)'>
<default>[]</default>
</key>