sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter/seat: Remove backend pointer

Browse source 
It was unused, and having a pointer to the MetaBackend in subtypes is
more useful, so remove it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1828>
This commit is contained in:
Jonas Ådahl 2021-04-06 16:52:26 +02:00
parent b4cf839e87
commit f6f9c093ba
2 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
clutter/clutter/clutter-seat.c
View file

@ -23,7 +23,6 @@
#include "clutter-build-config.h" #include "clutter-build-config.h"
#include "clutter-backend-private.h"
#include "clutter-input-device-tool.h" #include "clutter-input-device-tool.h"
#include "clutter-input-pointer-a11y-private.h" #include "clutter-input-pointer-a11y-private.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"
@ -52,7 +51,6 @@ static guint signals[N_SIGNALS] = { 0 };
enum enum
{ {
PROP_0, PROP_0,
PROP_BACKEND,
PROP_TOUCH_MODE, PROP_TOUCH_MODE,
N_PROPS N_PROPS
}; };
@ -63,8 +61,6 @@ typedef struct _ClutterSeatPrivate ClutterSeatPrivate;
struct _ClutterSeatPrivate struct _ClutterSeatPrivate
{ {
ClutterBackend *backend;
unsigned int inhibit_unfocus_count; unsigned int inhibit_unfocus_count;
/* Pointer a11y */ /* Pointer a11y */
@ -79,14 +75,8 @@ clutter_seat_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ClutterSeat *seat = CLUTTER_SEAT (object);
ClutterSeatPrivate *priv = clutter_seat_get_instance_private (seat);
switch (prop_id) switch (prop_id)
{ {
case PROP_BACKEND:
priv->backend = g_value_get_object (value);
break;
case PROP_TOUCH_MODE: case PROP_TOUCH_MODE:
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -99,14 +89,8 @@ clutter_seat_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ClutterSeat *seat = CLUTTER_SEAT (object);
ClutterSeatPrivate *priv = clutter_seat_get_instance_private (seat);
switch (prop_id) switch (prop_id)
{ {
case PROP_BACKEND:
g_value_set_object (value, priv->backend);
break;
case PROP_TOUCH_MODE: case PROP_TOUCH_MODE:
g_value_set_boolean (value, FALSE); g_value_set_boolean (value, FALSE);
break; break;
@ -280,13 +264,6 @@ clutter_seat_class_init (ClutterSeatClass *klass)
0, NULL, NULL, NULL, 0, NULL, NULL, NULL,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
props[PROP_BACKEND] =
g_param_spec_object ("backend",
P_("Backend"),
P_("Backend"),
CLUTTER_TYPE_BACKEND,
CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
/** /**
* ClutterSeat:touch-mode: * ClutterSeat:touch-mode:
* *

2
src/backends/native/meta-backend-native.c
View file

@ -136,7 +136,6 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
GError **error) GError **error)
{ {
MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend); MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
const char *seat_id; const char *seat_id;
MetaSeatNativeFlag flags; MetaSeatNativeFlag flags;
@ -148,7 +147,6 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
flags = META_SEAT_NATIVE_FLAG_NONE; flags = META_SEAT_NATIVE_FLAG_NONE;
return CLUTTER_SEAT (g_object_new (META_TYPE_SEAT_NATIVE, return CLUTTER_SEAT (g_object_new (META_TYPE_SEAT_NATIVE,
"backend", clutter_backend,
"seat-id", seat_id, "seat-id", seat_id,
"flags", flags, "flags", flags,
NULL)); NULL));