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

tests: Drop usage of clutter_input_device_get_device_id()

Browse Source 
We already print device names there.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1569>
This commit is contained in:
Carlos Garnacho 2020-11-17 14:53:34 +01:00 committed by Marge Bot
parent 7aa63d6b8b
commit 9e894b2e1d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tests/clutter/interactive/test-devices.c
View File

@ -93,9 +93,8 @@ stage_button_event_cb (ClutterActor *actor,
hand = g_hash_table_lookup (app->devices, device); hand = g_hash_table_lookup (app->devices, device);
g_print ("Device: '%s' (id:%d, type: %s, source: '%s', axes: %d)\n", g_print ("Device: '%s' (type: %s, source: '%s', axes: %d)\n",
clutter_input_device_get_device_name (device), clutter_input_device_get_device_name (device),
clutter_input_device_get_device_id (device),
device_type_name (device), device_type_name (device),
source_device != device source_device != device
? clutter_input_device_get_device_name (source_device) ? clutter_input_device_get_device_name (source_device)
@ -160,10 +159,9 @@ seat_device_added_cb (ClutterSeat *seat,
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterActor *hand = NULL; ClutterActor *hand = NULL;
g_print ("got a %s device '%s' with id %d\n", g_print ("got a %s device '%s'\n",
device_type_name (device), device_type_name (device),
clutter_input_device_get_device_name (device), clutter_input_device_get_device_name (device));
clutter_input_device_get_device_id (device));
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE || if (device_type == CLUTTER_POINTER_DEVICE ||
@ -193,10 +191,9 @@ seat_device_removed_cb (ClutterSeat *seat,
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterActor *hand = NULL; ClutterActor *hand = NULL;
g_print ("removed a %s device '%s' with id %d\n", g_print ("removed a %s device '%s'\n",
device_type_name (device), device_type_name (device),
clutter_input_device_get_device_name (device), clutter_input_device_get_device_name (device));
clutter_input_device_get_device_id (device));
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE || if (device_type == CLUTTER_POINTER_DEVICE ||
@ -259,10 +256,9 @@ test_devices_main (int argc, char **argv)
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterActor *hand = NULL; ClutterActor *hand = NULL;
g_print ("got a %s device '%s' with id %d\n", g_print ("got a %s device '%s'\n",
device_type_name (device), device_type_name (device),
clutter_input_device_get_device_name (device), clutter_input_device_get_device_name (device));
clutter_input_device_get_device_id (device));
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE || if (device_type == CLUTTER_POINTER_DEVICE ||