← Back to branch summary

~ps-jenkins/libgrip/latestsnapshot-0.3.6daily13.06.05-0ubuntu1

« back to all changes in this revision

Viewing changes to src/gripgesturemanager.c

  • Committer: Jussi Pakkanen
  • Date: 2011-09-05 07:06:01 UTC
  • mfrom: (58.1.1 libgrip)
  • Revision ID: jussi.pakkanen@canonical.com-20110905070601-uvl6hioriiungytz
Merged unsubscribe fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gripgesturemanager.c
1209
1209
    }
1210
1210
  else
1211
1211
    {
1212
 
      geis_unsubscribe (registrations->touchscreen->instance,
1213
 
          (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
1214
 
      geis_unsubscribe (registrations->touchpad->instance,
1215
 
          (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
1216
 
      geis_unsubscribe (registrations->independent->instance,
1217
 
          (GeisGestureType*)registrations->independent->gesture_list->pdata);
 
1212
      if (device_type & GRIP_DEVICE_TOUCHSCREEN)
 
1213
        geis_unsubscribe (registrations->touchscreen->instance,
 
1214
            (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
 
1215
      if (device_type & GRIP_DEVICE_TOUCHPAD)
 
1216
        geis_unsubscribe (registrations->touchpad->instance,
 
1217
            (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
 
1218
      if (device_type & GRIP_DEVICE_INDEPENDENT)
 
1219
        geis_unsubscribe (registrations->independent->instance,
 
1220
            (GeisGestureType*)registrations->independent->gesture_list->pdata);
1218
1221
    }
1219
1222
 
1220
1223
  if (device_type & GRIP_DEVICE_TOUCHSCREEN)
1226
1229
    bind_registration(manager,
1227
1230
        registrations->touchpad, widget, gesture_type, GRIP_DEVICE_TOUCHPAD, touch_points,
1228
1231
        callback, user_data, destroy);
 
1232
 
1229
1233
  if (device_type & GRIP_DEVICE_INDEPENDENT)
1230
1234
    bind_registration(manager,
1231
1235
        registrations->independent, widget, gesture_type, GRIP_DEVICE_INDEPENDENT, touch_points,