Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/clutter/clutter/evdev/clutter-device-manager-evdev.c b/clutter/clutter/evdev/clutter-device-manager-evdev.c
- index bc9549de9..2913d1852 100644
- --- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
- +++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
- @@ -919,7 +919,6 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
- ClutterDeviceManagerEvdev *manager_evdev;
- ClutterDeviceManagerEvdevPrivate *priv;
- GSList *l;
- - GSList *device_it;
- manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
- priv = manager_evdev->priv;
- @@ -927,17 +926,13 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
- for (l = priv->seats; l; l = l->next)
- {
- ClutterSeatEvdev *seat = l->data;
- + ClutterInputDevice *device = clutter_seat_evdev_get_device (seat, id);
- - for (device_it = seat->devices; device_it; device_it = device_it->next)
- - {
- - ClutterInputDevice *device = device_it->data;
- -
- - if (clutter_input_device_get_device_id (device) == id)
- + if (device)
- return device;
- }
- - }
- - return NULL;
- + return clutter_seat_evdev_get_device (priv->main_seat, id);
- }
- static void
- diff --git a/clutter/clutter/evdev/clutter-seat-evdev.c b/clutter/clutter/evdev/clutter-seat-evdev.c
- index e91f3673b..83236e861 100644
- --- a/clutter/clutter/evdev/clutter-seat-evdev.c
- +++ b/clutter/clutter/evdev/clutter-seat-evdev.c
- @@ -858,6 +858,24 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
- g_free (seat);
- }
- +ClutterInputDevice *
- +clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
- + gint id)
- +{
- + ClutterInputDevice *device;
- + GSList *device_it;
- +
- + for (device_it = seat->devices; device_it; device_it = device_it->next)
- + {
- + device = device_it->data;
- +
- + if (clutter_input_device_get_device_id (device) == id)
- + return device;
- + }
- +
- + return NULL;
- +}
- +
- void
- clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
- ClutterStage *stage)
- diff --git a/clutter/clutter/evdev/clutter-seat-evdev.h b/clutter/clutter/evdev/clutter-seat-evdev.h
- index 0fb89e33e..2480abb2d 100644
- --- a/clutter/clutter/evdev/clutter-seat-evdev.h
- +++ b/clutter/clutter/evdev/clutter-seat-evdev.h
- @@ -148,6 +148,9 @@ void clutter_seat_evdev_release_touch_state (ClutterSeatEvdev *seat,
- ClutterTouchState * clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
- guint32 id);
- +ClutterInputDevice * clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
- + gint id);
- +
- void clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
- ClutterStage *stage);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement