2009-04-07 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-color-chooser.c (hildon_color_chooser_pointer_motion):
	Use the event coordinates instead of gdk_window_get_pointer(). Also,
	request more motions after using it. This fixes x and y variables being
	potentially uninitialized.

diff --git a/ChangeLog b/ChangeLog
index ebfd2fa..697ae88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-07  Claudio Saavedra  <csaavedra@igalia.com>
 
+       * src/hildon-color-chooser.c (hildon_color_chooser_pointer_motion):
+       Use the event coordinates instead of gdk_window_get_pointer(). Also,
+       request more motions after using it.
+
+2009-04-07  Claudio Saavedra  <csaavedra@igalia.com>
+
        * src/hildon-calendar.c (hildon_calendar_expose),
        (hildon_calendar_paint_main), (hildon_calendar_enter_notify):
        Remove unused variables.

diff --git a/src/hildon-color-chooser.c b/src/hildon-color-chooser.c
index acbf971..14d39d9 100644 (file)
--- a/src/hildon-color-chooser.c
+++ b/src/hildon-color-chooser.c
@@ -701,13 +701,12 @@ hildon_color_chooser_pointer_motion             (GtkWidget *widget,
     HildonColorChooser *sel = HILDON_COLOR_CHOOSER (widget);
     HildonColorChooserPrivate *priv = HILDON_COLOR_CHOOSER_GET_PRIVATE (widget);
 
-    GdkModifierType mods;
     gint x, y, tmp;
 
     g_assert (priv);
 
-    if (event->is_hint || (event->window != widget->window))
-        gdk_window_get_pointer (widget->window, &x, &y, &mods);
+    x = (gint) event->x;
+    y = (gint) event->y;
 
     if (priv->mousestate == 1) {
         if (x >= priv->spa.x && x <= priv->spa.x + priv->spa.width &&
@@ -740,6 +739,8 @@ hildon_color_chooser_pointer_motion             (GtkWidget *widget,
         }
     }
 
+    gdk_event_request_motions (event);
+
     return FALSE;
 }