Plug a leak

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

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index ff51d73448de3f2cc2526c54e2e09901702ae6cd..896a8f70f85ddbaa9d4d06aea610888a338cd134 100644 (file)
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -309,7 +309,7 @@ remove_palette (GtkColorChooserWidget *cc)
 
 static void
 add_palette (GtkColorChooserWidget  *cc,
-             gboolean                horizontal,
+             GtkOrientation          orientation,
              gint                    colors_per_line,
              gint                    n_colors,
              GdkRGBA                *colors,
@@ -368,7 +368,7 @@ add_palette (GtkColorChooserWidget  *cc,
       line = i / colors_per_line;
       pos = i % colors_per_line;
 
-      if (horizontal)
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
         {
             if (pos == left)
               gtk_style_context_add_class (gtk_widget_get_style_context (p), GTK_STYLE_CLASS_LEFT);
@@ -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;
 }
@@ -761,6 +761,7 @@ gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
             {
               select_swatch (cc, swatch);
               g_list_free (children);
+              g_list_free (palettes);
               return;
             }
         }
@@ -773,7 +774,7 @@ gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
 
 static void
 gtk_color_chooser_widget_add_palette (GtkColorChooser *chooser,
-                                      gboolean         horizontal,
+                                      GtkOrientation   orientation,
                                       gint             colors_per_line,
                                       gint             n_colors,
                                       GdkRGBA         *colors)
@@ -781,7 +782,7 @@ gtk_color_chooser_widget_add_palette (GtkColorChooser *chooser,
   GtkColorChooserWidget *cc = GTK_COLOR_CHOOSER_WIDGET (chooser);
 
   remove_default_palette (cc);
-  add_palette (cc, horizontal, colors_per_line, n_colors, colors, NULL);
+  add_palette (cc, orientation, colors_per_line, n_colors, colors, NULL);
 }
 
 static void