Re-fix opacity group handling

[~andy/gtk] / gtk / gtkcolorchooserwidget.c

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 92f293f843bfc57396c893dbe3b777dfb42b0ef4..be954a26687421d4800fd072c85f3380afb7a534 100644 (file)
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -473,12 +473,12 @@ add_default_palette (GtkColorChooserWidget *cc)
     for (j = 0; j < 3; j++)
       gdk_rgba_parse (&colors[i*3 + j], default_colors[i][j]);
 
-  add_palette (cc, FALSE, 3, 9*3, colors, color_names);
+  add_palette (cc, GTK_ORIENTATION_VERTICAL, 3, 9*3, colors, color_names);
 
   for (i = 0; i < 9; i++)
     gdk_rgba_parse (&colors[i], default_grays[i]);
 
-  add_palette (cc, TRUE, 9, 9, colors, gray_names);
+  add_palette (cc, GTK_ORIENTATION_HORIZONTAL, 9, 9, colors, gray_names);
 
   cc->priv->has_default_palette = TRUE;
 }
@@ -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;
@@ -761,6 +760,7 @@ gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
             {
               select_swatch (cc, swatch);
               g_list_free (children);
+              g_list_free (palettes);
               return;
             }
         }