[mutter/wip/carlosg/no-device-id: 6/10] tests: Drop usage of clutter_input_device_get_device_id()
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/no-device-id: 6/10] tests: Drop usage of clutter_input_device_get_device_id()
- Date: Wed, 18 Nov 2020 19:10:53 +0000 (UTC)
commit 9e894b2e1d86f82c8399956da47be1fe537f4fdf
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Nov 17 14:53:34 2020 +0100
tests: Drop usage of clutter_input_device_get_device_id()
We already print device names there.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1569>
src/tests/clutter/interactive/test-devices.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/tests/clutter/interactive/test-devices.c b/src/tests/clutter/interactive/test-devices.c
index 606babdf40..9a63f731e9 100644
--- a/src/tests/clutter/interactive/test-devices.c
+++ b/src/tests/clutter/interactive/test-devices.c
@@ -93,9 +93,8 @@ stage_button_event_cb (ClutterActor *actor,
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_id (device),
device_type_name (device),
source_device != device
? clutter_input_device_get_device_name (source_device)
@@ -160,10 +159,9 @@ seat_device_added_cb (ClutterSeat *seat,
ClutterInputDeviceType device_type;
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),
- clutter_input_device_get_device_name (device),
- clutter_input_device_get_device_id (device));
+ clutter_input_device_get_device_name (device));
device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE ||
@@ -193,10 +191,9 @@ seat_device_removed_cb (ClutterSeat *seat,
ClutterInputDeviceType device_type;
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),
- clutter_input_device_get_device_name (device),
- clutter_input_device_get_device_id (device));
+ clutter_input_device_get_device_name (device));
device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE ||
@@ -259,10 +256,9 @@ test_devices_main (int argc, char **argv)
ClutterInputDeviceType device_type;
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),
- clutter_input_device_get_device_name (device),
- clutter_input_device_get_device_id (device));
+ clutter_input_device_get_device_name (device));
device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]