GtkBubbleWindow: allocate CSS borders and paddings

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

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 2d3ba3a61b3281dbf52a5a23c12b9c0d4f92cd81..8e6cf2c82e78506d8cdf72e1aa032b3c4d91b01e 100644 (file)
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -296,6 +296,10 @@ remove_palette (GtkColorChooserWidget *cc)
   GList *children, *l;
   GtkWidget *widget;
 
+  if (cc->priv->current != NULL &&
+      gtk_widget_get_parent (GTK_WIDGET (cc->priv->current)) != cc->priv->custom)
+    cc->priv->current = NULL;
+
   children = gtk_container_get_children (GTK_CONTAINER (cc->priv->palette));
   for (l = children; l; l = l->next)
     {
@@ -526,8 +530,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 +764,7 @@ gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
             {
               select_swatch (cc, swatch);
               g_list_free (children);
+              g_list_free (palettes);
               return;
             }
         }