diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2020-03-06 14:37:01 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-03-24 18:07:31 +0000 |
| commit | 3b88af94e328ca3064b8d4582349cc1904619755 (patch) | |
| tree | 98e1eb35ed97ff4529f93651ad1f52af44cabf53 /src/backends/x11/meta-seat-x11.c | |
| parent | 1f00aba92c324ec501a775fe288af187f3c36910 (diff) | |
| download | mutter-3b88af94e328ca3064b8d4582349cc1904619755.tar.gz | |
backends/x11: Drop internal WacomDevice lookups
Just use the ones from MetaInputDevice.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1109
Diffstat (limited to 'src/backends/x11/meta-seat-x11.c')
| -rw-r--r-- | src/backends/x11/meta-seat-x11.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c index 8849cd3d8..e6e996803 100644 --- a/src/backends/x11/meta-seat-x11.c +++ b/src/backends/x11/meta-seat-x11.c @@ -54,10 +54,6 @@ struct _MetaSeatX11 int pointer_id; int keyboard_id; int opcode; - -#ifdef HAVE_LIBWACOM - WacomDeviceDatabase *wacom_db; -#endif }; static GParamSpec *props[N_PROPS] = { 0 }; @@ -557,11 +553,6 @@ create_device (MetaSeatX11 *seat_x11, info->classes, info->num_classes); -#ifdef HAVE_LIBWACOM - if (source == CLUTTER_PAD_DEVICE) - meta_input_device_x11_ensure_wacom_info (retval, seat_x11->wacom_db); -#endif - g_free (vendor_id); g_free (product_id); g_free (node_path); @@ -1410,10 +1401,6 @@ meta_seat_x11_finalize (GObject *object) g_hash_table_unref (seat_x11->tools_by_serial); g_list_free (seat_x11->devices); -#ifdef HAVE_LIBWACOM - libwacom_database_destroy (seat_x11->wacom_db); -#endif - G_OBJECT_CLASS (meta_seat_x11_parent_class)->finalize (object); } @@ -1570,10 +1557,6 @@ meta_seat_x11_init (MetaSeatX11 *seat) (GDestroyNotify) g_object_unref); seat->tools_by_serial = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref); - -#ifdef HAVE_LIBWACOM - seat->wacom_db = libwacom_database_new (); -#endif } MetaSeatX11 * |