Fix compiler warnings

svn path=/trunk/; revision=17062

diff --git a/ChangeLog b/ChangeLog
index db177da2c689918a5cf36ba11cbf1b86cd1ffa12..290b98af0b6a1e456091659d0bced5254889b615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcolorsel.c: Fix some compiler warnings.
+
 2007-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c: Rework the beep-on-uninserted-text

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index f9a2433f665533585c71ea8eec2c26f857fe27b4..ce7ca687ce72c79a975b660fe26202d902bcacf1 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -787,6 +787,7 @@ palette_change_color (GtkWidget         *drawing_area,
   gdk_color.red = UNSCALE (color[0]);
   gdk_color.green = UNSCALE (color[1]);
   gdk_color.blue = UNSCALE (color[2]);
+  gdk_color.pixel = 0;
 
   x = 0;
   y = 0;                       /* Quiet GCC */
@@ -1441,7 +1442,7 @@ get_screen_color (GtkWidget *button)
       gtk_widget_add_events (grab_widget,
                              GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
       
-      toplevel = gtk_widget_get_toplevel (colorsel);
+      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (colorsel));
   
       if (GTK_IS_WINDOW (toplevel))
        {