Merge lp:~jpakkane/libgrip/unsubscribe-fix into lp:libgrip

[Jussi Pakkanen]

When subscribing to new gestures, libgrip unsubscribes every device type but only resubscribes the specified gesture types.

This patch fixes the issue by only unsubscribing those gesture types that will get resubscribed.

[Chase Douglas (chasedouglas)]

Is the stray additional line supposed to be there? If it's a random cleanup that was just folded into the commit, then that's fine, but if it's accidental it should be fixed before merging.

I'm going to assume that it's intentional and give approval. It looks like a good fix for an obvious bug in hindsight :).

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-08-10 00:18:08 +0000
+++ src/gripgesturemanager.c	2011-09-02 10:43:42 +0000
@@ -1209,12 +1209,15 @@
     }
   else
     {
-      geis_unsubscribe (registrations->touchscreen->instance,
-          (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
-      geis_unsubscribe (registrations->touchpad->instance,
-          (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
-      geis_unsubscribe (registrations->independent->instance,
-          (GeisGestureType*)registrations->independent->gesture_list->pdata);
+      if (device_type & GRIP_DEVICE_TOUCHSCREEN)
+        geis_unsubscribe (registrations->touchscreen->instance,
+            (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
+      if (device_type & GRIP_DEVICE_TOUCHPAD)
+        geis_unsubscribe (registrations->touchpad->instance,
+            (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
+      if (device_type & GRIP_DEVICE_INDEPENDENT)
+        geis_unsubscribe (registrations->independent->instance,
+            (GeisGestureType*)registrations->independent->gesture_list->pdata);
     }
 
   if (device_type & GRIP_DEVICE_TOUCHSCREEN)
@@ -1226,6 +1229,7 @@
     bind_registration(manager,
         registrations->touchpad, widget, gesture_type, GRIP_DEVICE_TOUCHPAD, touch_points,
         callback, user_data, destroy);
+
   if (device_type & GRIP_DEVICE_INDEPENDENT)
     bind_registration(manager,
         registrations->independent, widget, gesture_type, GRIP_DEVICE_INDEPENDENT, touch_points,