isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/input-device: Replace device check with assertion

Browse Source 
We only call _clutter_input_device_update with devices that are not
Keyboard devices. Also passing a Keyboard device to a function whose
primary purpose is picking should be considered a bug in the caller.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/547
This commit is contained in:
Jonas Dreßler 2019-02-04 22:22:48 +01:00 committed by Carlos Garnacho
parent 30a2483e6e
commit 786305f7d6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter/clutter-input-device.c
View File

@ -1036,9 +1036,10 @@ _clutter_input_device_update (ClutterInputDevice *device,
ClutterActor *new_cursor_actor; ClutterActor *new_cursor_actor;
ClutterActor *old_cursor_actor; ClutterActor *old_cursor_actor;
ClutterPoint point = { -1, -1 }; ClutterPoint point = { -1, -1 };
ClutterInputDeviceType device_type = device->device_type;
if (device->device_type == CLUTTER_KEYBOARD_DEVICE) g_assert (device_type != CLUTTER_KEYBOARD_DEVICE &&
return NULL; device_type != CLUTTER_PAD_DEVICE);
stage = device->stage; stage = device->stage;
if (G_UNLIKELY (stage == NULL)) if (G_UNLIKELY (stage == NULL))