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

backend: Init settings before initable_init

Browse Source 
This means the settings instance is there before the backend backend's
initable_init() function gets called.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3085>
This commit is contained in:
Jonas Ådahl 2023-06-22 10:35:27 +02:00 committed by Marge Bot
parent 9f46258ff9
commit d67d22f948
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backends/meta-backend.c
View File

@ -791,6 +791,8 @@ meta_backend_constructed (GObject *object)
g_assert (priv->context); g_assert (priv->context);
priv->settings = meta_settings_new (backend);
#ifdef HAVE_LIBWACOM #ifdef HAVE_LIBWACOM
priv->wacom_db = libwacom_database_new (); priv->wacom_db = libwacom_database_new ();
if (!priv->wacom_db) if (!priv->wacom_db)
@ -1201,7 +1203,6 @@ meta_backend_initable_init (GInitable *initable,
MetaBackend *backend = META_BACKEND (initable); MetaBackend *backend = META_BACKEND (initable);
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
priv->settings = meta_settings_new (backend);
priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL); priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL);
priv->monitor_manager = meta_backend_create_monitor_manager (backend, error); priv->monitor_manager = meta_backend_create_monitor_manager (backend, error);