From f6f9c093ba009d012adeb77be9f4ffb455bc7cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 6 Apr 2021 16:52:26 +0200
Subject: [PATCH] clutter/seat: Remove backend pointer

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>
---
 clutter/clutter/clutter-seat.c            | 23 -----------------------
 src/backends/native/meta-backend-native.c |  2 --
 2 files changed, 25 deletions(-)

diff --git a/clutter/clutter/clutter-seat.c b/clutter/clutter/clutter-seat.c
index a62aeedc2..3e7435fd9 100644
--- a/clutter/clutter/clutter-seat.c
+++ b/clutter/clutter/clutter-seat.c
@@ -23,7 +23,6 @@
 
 #include "clutter-build-config.h"
 
-#include "clutter-backend-private.h"
 #include "clutter-input-device-tool.h"
 #include "clutter-input-pointer-a11y-private.h"
 #include "clutter-marshal.h"
@@ -52,7 +51,6 @@ static guint signals[N_SIGNALS] = { 0 };
 enum
 {
   PROP_0,
-  PROP_BACKEND,
   PROP_TOUCH_MODE,
   N_PROPS
 };
@@ -63,8 +61,6 @@ typedef struct _ClutterSeatPrivate ClutterSeatPrivate;
 
 struct _ClutterSeatPrivate
 {
-  ClutterBackend *backend;
-
   unsigned int inhibit_unfocus_count;
 
   /* Pointer a11y */
@@ -79,14 +75,8 @@ clutter_seat_set_property (GObject      *object,
                            const GValue *value,
                            GParamSpec   *pspec)
 {
-  ClutterSeat *seat = CLUTTER_SEAT (object);
-  ClutterSeatPrivate *priv = clutter_seat_get_instance_private (seat);
-
   switch (prop_id)
     {
-    case PROP_BACKEND:
-      priv->backend = g_value_get_object (value);
-      break;
     case PROP_TOUCH_MODE:
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -99,14 +89,8 @@ clutter_seat_get_property (GObject    *object,
                            GValue     *value,
                            GParamSpec *pspec)
 {
-  ClutterSeat *seat = CLUTTER_SEAT (object);
-  ClutterSeatPrivate *priv = clutter_seat_get_instance_private (seat);
-
   switch (prop_id)
     {
-    case PROP_BACKEND:
-      g_value_set_object (value, priv->backend);
-      break;
     case PROP_TOUCH_MODE:
       g_value_set_boolean (value, FALSE);
       break;
@@ -280,13 +264,6 @@ clutter_seat_class_init (ClutterSeatClass *klass)
                   0, NULL, NULL, NULL,
                   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:
    *
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index 79c73f35c..0c1eebcc9 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -136,7 +136,6 @@ meta_backend_native_create_default_seat (MetaBackend  *backend,
                                          GError      **error)
 {
   MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
-  ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
   const char *seat_id;
   MetaSeatNativeFlag flags;
 
@@ -148,7 +147,6 @@ meta_backend_native_create_default_seat (MetaBackend  *backend,
     flags = META_SEAT_NATIVE_FLAG_NONE;
 
   return CLUTTER_SEAT (g_object_new (META_TYPE_SEAT_NATIVE,
-                                     "backend", clutter_backend,
                                      "seat-id", seat_id,
                                      "flags", flags,
                                      NULL));