From 63a7313a1bd0383a9aae16ff8127432ac30c8ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Sat, 5 Aug 2023 14:54:43 +0200
Subject: [PATCH] compositor: Fold meta_compositor_do_manage into
 meta_compositor_manage

meta_compositor_manage hasn't been public API since 4b3cab2ccad5
("compositor: Don't make internal API public").

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3154>
---
 src/compositor/compositor-private.h |  6 ++----
 src/compositor/compositor.c         | 13 ++-----------
 src/core/display.c                  |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index df22082d6..c0414f7b3 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -40,9 +40,6 @@ struct _MetaCompositorClass
                                         ClutterStageView *stage_view);
 };
 
-gboolean meta_compositor_do_manage (MetaCompositor  *compositor,
-                                    GError         **error);
-
 void meta_compositor_remove_window_actor (MetaCompositor  *compositor,
                                           MetaWindowActor *window_actor);
 
@@ -93,7 +90,8 @@ void meta_compositor_grab_end (MetaCompositor *compositor);
 
 void meta_compositor_destroy (MetaCompositor *compositor);
 
-void meta_compositor_manage   (MetaCompositor *compositor);
+gboolean meta_compositor_manage (MetaCompositor  *compositor,
+                                 GError         **error);
 
 void meta_compositor_unmanage (MetaCompositor *compositor);
 
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 209dfc207..83e4b1452 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -397,8 +397,8 @@ meta_compositor_create_view (MetaCompositor   *compositor,
 }
 
 gboolean
-meta_compositor_do_manage (MetaCompositor  *compositor,
-                           GError         **error)
+meta_compositor_manage (MetaCompositor  *compositor,
+                        GError         **error)
 {
   MetaCompositorPrivate *priv =
     meta_compositor_get_instance_private (compositor);
@@ -428,15 +428,6 @@ meta_compositor_do_manage (MetaCompositor  *compositor,
   return TRUE;
 }
 
-void
-meta_compositor_manage (MetaCompositor *compositor)
-{
-  GError *error = NULL;
-
-  if (!meta_compositor_do_manage (compositor, &error))
-    g_error ("Compositor failed to manage display: %s", error->message);
-}
-
 static void
 meta_compositor_real_unmanage (MetaCompositor *compositor)
 {
diff --git a/src/core/display.c b/src/core/display.c
index 062e0fd13..652bd97ef 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1046,7 +1046,7 @@ meta_display_new (MetaContext  *context,
                           &old_active_xwindow);
 #endif
 
-  if (!meta_compositor_do_manage (display->compositor, error))
+  if (!meta_compositor_manage (display->compositor, error))
     {
       g_object_unref (display);
       return NULL;