brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove meta_quit()

Browse Source 
It is no longer used, so remove it. This also removes the intermediate
MetaContext global singleton, as it is no longer needed.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
Jonas Ådahl 2021-03-03 17:26:47 +01:00
parent 122aa94642
commit 6768b509ea
4 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/main.c
View File

@ -56,30 +56,6 @@
MetaContext *
meta_get_context_temporary (void);
/**
* meta_quit:
* @code: The success or failure code to return to the calling process.
*
* Stops Mutter. This tells the event loop to stop processing; it is
* rather dangerous to use this because this will leave the user with
* no window manager. We generally do this only if, for example, the
* session manager asks us to; we assume the session manager knows
* what it's talking about.
*/
void
meta_quit (MetaExitCode code)
{
MetaContext *context;
context = meta_get_context_temporary ();
g_assert (context);
if (code == META_EXIT_SUCCESS)
{
meta_context_terminate (context);
}
}
static MetaX11DisplayPolicy x11_display_policy_override = -1;
void

21
src/core/meta-context.c
View File

@ -454,24 +454,6 @@ meta_context_finalize (GObject *object)
G_OBJECT_CLASS (meta_context_parent_class)->finalize (object);
}
/*
* NOTE!
*
* This global singletone is a temporary stop-gap solution
* to allow migrating to MetaContext in smaller steps. It will
* be removed later in this series of changes.
*/
static MetaContext *_context_temporary;
MetaContext *
meta_get_context_temporary (void);
MetaContext *
meta_get_context_temporary (void)
{
return _context_temporary;
}
static void
meta_context_class_init (MetaContextClass *klass)
{
@ -500,9 +482,6 @@ meta_context_init (MetaContext *context)
{
MetaContextPrivate *priv = meta_context_get_instance_private (context);
g_assert (!_context_temporary);
_context_temporary = context;
priv->plugin_gtype = G_TYPE_NONE;
if (!setlocale (LC_ALL, ""))

2
src/meson.build
View File

@ -358,8 +358,8 @@ mutter_sources = [
'core/frame.h',
'core/keybindings.c',
'core/keybindings-private.h',
'core/main.c',
'core/main-private.h',
'core/main.c',
'core/meta-accel-parse.c',
'core/meta-accel-parse.h',
'core/meta-anonymous-file.c',

4
src/meta/main.h
View File

@ -56,8 +56,4 @@ typedef enum
META_EXPORT
void meta_exit (MetaExitCode code) G_GNUC_NORETURN;
/* g_main_loop_quit() then fall out of main() */
META_EXPORT
void meta_quit (MetaExitCode code);
#endif