2008-03-04 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-main.c (clutter_do_event): Do not throttle the
	motion events if the per-actor delivery has been disabled.

diff --git a/ChangeLog b/ChangeLog
index 785cc31..257d656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * clutter/clutter-main.c (clutter_do_event): Do not throttle the
+       motion events if the per-actor delivery has been disabled.
+
 2008-03-04  Øyvind Kolås  <pippin@o-hand.com>
 
        * clutter/pango/pangoclutter-render.c: (draw_glyph): use g_slice_new0

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 9aee4a9..d34ab3b 100644 (file)
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -1424,8 +1424,11 @@ clutter_do_event (ClutterEvent *event)
 
       case CLUTTER_MOTION:
 
-        /* avoid rate throttling for synthetic motion events */
-        if (! (event->any.flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
+        /* avoid rate throttling for synthetic motion events or if
+         * the per-actor events are disabled
+         */
+        if (!(event->any.flags & CLUTTER_EVENT_FLAG_SYNTHETIC) ||
+            !context->motion_events_per_actor)
           {
             gint32 frame_rate, delta;