From fa59796afdc30e0e81d4a6efd75a996c4907b3eb Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Fri, 9 Feb 2024 14:46:35 +0100
Subject: [PATCH] meta: Drop deprecated methods

Both functions were deprecated 20months ago, so should be safe
to remove now

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3573>
---
 src/compositor/compositor.c  | 17 -----------------
 src/core/display.c           | 23 -----------------------
 src/meta/compositor-mutter.h |  4 ----
 src/meta/display.h           |  4 ----
 4 files changed, 48 deletions(-)

diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 60540d25a..349f12e34 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -291,23 +291,6 @@ meta_compositor_get_feedback_group (MetaCompositor *compositor)
   return priv->feedback_group;
 }
 
-/**
- * meta_get_feedback_group_for_display:
- * @display: a #MetaDisplay
- *
- * Returns: (transfer none): The feedback group corresponding to @display
- */
-ClutterActor *
-meta_get_feedback_group_for_display (MetaDisplay *display)
-{
-  MetaCompositor *compositor;
-
-  g_return_val_if_fail (display, NULL);
-
-  compositor = get_compositor_for_display (display);
-  return meta_compositor_get_feedback_group (compositor);
-}
-
 /**
  * meta_get_window_actors:
  * @display: a #MetaDisplay
diff --git a/src/core/display.c b/src/core/display.c
index 368db23ff..9e6457583 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2537,29 +2537,6 @@ meta_display_modifiers_accelerator_activate (MetaDisplay *display)
   return freeze;
 }
 
-/**
- * meta_display_supports_extended_barriers:
- * @display: a #MetaDisplay
- *
- * Returns: whether pointer barriers can be supported.
- *
- * When running as an X compositor the X server needs XInput 2
- * version 2.3. When running as a display server it is supported
- * when running on the native backend.
- *
- * Clients should use this method to determine whether their
- * interfaces should depend on new barrier features.
- */
-gboolean
-meta_display_supports_extended_barriers (MetaDisplay *display)
-{
-  MetaContext *context = meta_display_get_context (display);
-  MetaBackend *backend = meta_context_get_backend (context);
-
-  return !!(meta_backend_get_capabilities (backend) &
-            META_BACKEND_CAPABILITY_BARRIERS);
-}
-
 /**
  * meta_display_get_context:
  * @display: a #MetaDisplay
diff --git a/src/meta/compositor-mutter.h b/src/meta/compositor-mutter.h
index fac2d6467..3a365f2d7 100644
--- a/src/meta/compositor-mutter.h
+++ b/src/meta/compositor-mutter.h
@@ -40,10 +40,6 @@ ClutterActor *meta_get_window_group_for_display     (MetaDisplay *display);
 META_EXPORT
 ClutterActor *meta_get_top_window_group_for_display (MetaDisplay *display);
 
-META_EXPORT
-G_DEPRECATED_FOR (meta_compositor_get_feedback_group)
-ClutterActor *meta_get_feedback_group_for_display   (MetaDisplay *display);
-
 META_EXPORT
 void meta_disable_unredirect_for_display (MetaDisplay *display);
 
diff --git a/src/meta/display.h b/src/meta/display.h
index 50a60ced8..18b435652 100644
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -83,10 +83,6 @@ GType meta_display_get_type (void) G_GNUC_CONST;
 
 #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)
 
-META_EXPORT
-G_DEPRECATED_FOR (meta_backend_get_capabilities)
-gboolean meta_display_supports_extended_barriers (MetaDisplay *display);
-
 META_EXPORT
 void meta_display_close (MetaDisplay *display,
                          guint32      timestamp);