isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-09 10:04:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter/input-device: Remove backend property

Browse Source 
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>
This commit is contained in:
Jonas Ådahl 2022-05-27 20:49:44 +02:00 committed by Marge Bot
parent 002a7deddd
commit 71371750d2
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,6 @@ enum
{ {
PROP_0, PROP_0,
PROP_BACKEND,
PROP_NAME, PROP_NAME,
PROP_DEVICE_TYPE, PROP_DEVICE_TYPE,
@ -89,8 +87,6 @@ struct _ClutterInputDevicePrivate
ClutterSeat *seat; ClutterSeat *seat;
ClutterBackend *backend;
char *vendor_id; char *vendor_id;
char *product_id; char *product_id;
char *node_path; char *node_path;
@ -198,10 +194,6 @@ clutter_input_device_set_property (GObject *gobject,
priv->device_mode = g_value_get_enum (value); priv->device_mode = g_value_get_enum (value);
break; break;
case PROP_BACKEND:
priv->backend = g_value_get_object (value);
break;
case PROP_NAME: case PROP_NAME:
priv->device_name = g_value_dup_string (value); priv->device_name = g_value_dup_string (value);
break; break;
@ -272,10 +264,6 @@ clutter_input_device_get_property (GObject *gobject,
g_value_set_enum (value, priv->device_mode); g_value_set_enum (value, priv->device_mode);
break; break;
case PROP_BACKEND:
g_value_set_object (value, priv->backend);
break;
case PROP_NAME: case PROP_NAME:
g_value_set_string (value, priv->device_name); g_value_set_string (value, priv->device_name);
break; break;
@ -400,18 +388,6 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass)
FALSE, FALSE,
CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); 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: * ClutterInputDevice:vendor-id:
* *

1
src/backends/x11/meta-seat-x11.c
View File

@ -651,7 +651,6 @@ create_device (MetaSeatX11 *seat_x11,
"device-type", source, "device-type", source,
"capabilities", capabilities, "capabilities", capabilities,
"device-mode", mode, "device-mode", mode,
"backend", clutter_backend,
"vendor-id", vendor_id, "vendor-id", vendor_id,
"product-id", product_id, "product-id", product_id,
"device-node", node_path, "device-node", node_path,

1
src/tests/meta-backend-test.c
View File

@ -161,7 +161,6 @@ meta_backend_test_add_test_device (MetaBackendTest *backend_test,
"device-type", CLUTTER_TOUCHSCREEN_DEVICE, "device-type", CLUTTER_TOUCHSCREEN_DEVICE,
"seat", seat, "seat", seat,
"has-cursor", has_cursor, "has-cursor", has_cursor,
"backend", clutter_backend,
"vendor-id", "MetaTest", "vendor-id", "MetaTest",
"product-id", product_id, "product-id", product_id,
"n-buttons", n_buttons, "n-buttons", n_buttons,