isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Fold meta_compositor_do_manage into meta_compositor_manage

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

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3154>
This commit is contained in:
Michel Dänzer 2023-08-05 14:54:43 +02:00 committed by Marge Bot
parent bf53623128
commit 63a7313a1b
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/compositor-private.h
View File

@ -40,9 +40,6 @@ struct _MetaCompositorClass
ClutterStageView *stage_view); ClutterStageView *stage_view);
}; };
gboolean meta_compositor_do_manage (MetaCompositor *compositor,
GError **error);
void meta_compositor_remove_window_actor (MetaCompositor *compositor, void meta_compositor_remove_window_actor (MetaCompositor *compositor,
MetaWindowActor *window_actor); MetaWindowActor *window_actor);
@ -93,7 +90,8 @@ void meta_compositor_grab_end (MetaCompositor *compositor);
void meta_compositor_destroy (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); void meta_compositor_unmanage (MetaCompositor *compositor);

11
src/compositor/compositor.c
View File

@ -397,7 +397,7 @@ meta_compositor_create_view (MetaCompositor *compositor,
} }
gboolean gboolean
meta_compositor_do_manage (MetaCompositor *compositor, meta_compositor_manage (MetaCompositor *compositor,
GError **error) GError **error)
{ {
MetaCompositorPrivate *priv = MetaCompositorPrivate *priv =
@ -428,15 +428,6 @@ meta_compositor_do_manage (MetaCompositor *compositor,
return TRUE; 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 static void
meta_compositor_real_unmanage (MetaCompositor *compositor) meta_compositor_real_unmanage (MetaCompositor *compositor)
{ {

2
src/core/display.c
View File

@ -1046,7 +1046,7 @@ meta_display_new (MetaContext *context,
&old_active_xwindow); &old_active_xwindow);
#endif #endif
if (!meta_compositor_do_manage (display->compositor, error)) if (!meta_compositor_manage (display->compositor, error))
{ {
g_object_unref (display); g_object_unref (display);
return NULL; return NULL;