diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2022-05-27 20:49:44 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2022-12-17 13:52:51 +0000 |
| commit | 71371750d29fb03ec6e00289eaad1c08dd3efc63 (patch) | |
| tree | 3dbaf4a17fb9d502884daaba6f35eb40acff6a46 | |
| parent | 002a7deddd287084acd55689348c6e97566933ee (diff) | |
| download | mutter-71371750d29fb03ec6e00289eaad1c08dd3efc63.tar.gz | |
clutter/input-device: Remove backend property
It will conflict with a MetaInputDevice property that'll have the same
name.
Wasn't set by the native backend anyway, so probably harmless.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2718>
| -rw-r--r-- | clutter/clutter/clutter-input-device.c | 24 | ||||
| -rw-r--r-- | src/backends/x11/meta-seat-x11.c | 1 | ||||
| -rw-r--r-- | src/tests/meta-backend-test.c | 1 |
3 files changed, 0 insertions, 26 deletions
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c index 9e30d3cbe..161bed3da 100644 --- a/clutter/clutter/clutter-input-device.c +++ b/clutter/clutter/clutter-input-device.c @@ -52,8 +52,6 @@ enum { PROP_0, - PROP_BACKEND, - PROP_NAME, PROP_DEVICE_TYPE, @@ -89,8 +87,6 @@ struct _ClutterInputDevicePrivate ClutterSeat *seat; - ClutterBackend *backend; - char *vendor_id; char *product_id; char *node_path; @@ -198,10 +194,6 @@ clutter_input_device_set_property (GObject *gobject, priv->device_mode = g_value_get_enum (value); break; - case PROP_BACKEND: - priv->backend = g_value_get_object (value); - break; - case PROP_NAME: priv->device_name = g_value_dup_string (value); break; @@ -272,10 +264,6 @@ clutter_input_device_get_property (GObject *gobject, g_value_set_enum (value, priv->device_mode); break; - case PROP_BACKEND: - g_value_set_object (value, priv->backend); - break; - case PROP_NAME: g_value_set_string (value, priv->device_name); break; @@ -401,18 +389,6 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass) CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); /** - * ClutterInputDevice:backend: - * - * The #ClutterBackend that created the device. - */ - obj_props[PROP_BACKEND] = - g_param_spec_object ("backend", - P_("Backend"), - P_("The backend instance"), - CLUTTER_TYPE_BACKEND, - CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - - /** * ClutterInputDevice:vendor-id: * * Vendor ID of this device.2 diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c index e99a4a871..1342e0c50 100644 --- a/src/backends/x11/meta-seat-x11.c +++ b/src/backends/x11/meta-seat-x11.c @@ -651,7 +651,6 @@ create_device (MetaSeatX11 *seat_x11, "device-type", source, "capabilities", capabilities, "device-mode", mode, - "backend", clutter_backend, "vendor-id", vendor_id, "product-id", product_id, "device-node", node_path, diff --git a/src/tests/meta-backend-test.c b/src/tests/meta-backend-test.c index fd380d579..0f443a31f 100644 --- a/src/tests/meta-backend-test.c +++ b/src/tests/meta-backend-test.c @@ -161,7 +161,6 @@ meta_backend_test_add_test_device (MetaBackendTest *backend_test, "device-type", CLUTTER_TOUCHSCREEN_DEVICE, "seat", seat, "has-cursor", has_cursor, - "backend", clutter_backend, "vendor-id", "MetaTest", "product-id", product_id, "n-buttons", n_buttons, |