r3229 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: . libmokoui

[chris at sita.openmoko.org]

Author: chris
Date: 2007-10-19 19:21:31 +0200 (Fri, 19 Oct 2007)
New Revision: 3229

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
        * libmokoui/moko-finger-scroll.c:
        (moko_finger_scroll_motion_notify_cb):
        Don't call gtk_widget_get_pointer too early


Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-10-19 16:02:30 UTC (rev 3228)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-10-19 17:21:31 UTC (rev 3229)
@@ -1,3 +1,9 @@
+2007-10-19  Chris Lord  <chris at openedhand.com>
+
+	* libmokoui/moko-finger-scroll.c:
+	(moko_finger_scroll_motion_notify_cb):
+	Don't call gtk_widget_get_pointer too early
+
 2007-10-18  Thomas Wood  <thomas at openedhand.com>
 
 	* libmokoui/moko-hint-entry.h: Correct a macro typo

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c	2007-10-19 16:02:30 UTC (rev 3228)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c	2007-10-19 17:21:31 UTC (rev 3229)
@@ -417,11 +417,13 @@
 	gint dnd_threshold;
 	gdouble x, y;
 
-	gdk_window_get_pointer (GTK_WIDGET (scroll)->window, NULL, NULL, 0);
-	
 	if ((!priv->enabled) || (!priv->clicked) ||
 	    ((event->time == priv->last_time) &&
-	     (event->type == priv->last_type))) return TRUE;
+	     (event->type == priv->last_type))) {
+		gdk_window_get_pointer (
+			GTK_WIDGET (scroll)->window, NULL, NULL, 0);
+		return TRUE;
+	}
 	
 	/* Only start the scroll if the mouse cursor passes beyond the
 	 * DnD threshold for dragging.
@@ -484,6 +486,8 @@
 		gdk_event_free ((GdkEvent *)event);
 	}
 
+	gdk_window_get_pointer (GTK_WIDGET (scroll)->window, NULL, NULL, 0);
+
 	return TRUE;
 }