[mutter/wip/gbsneto/kms-transactions-on-steroids: 3/30] backends/native: Move some initialization from init() to initable_init()
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/gbsneto/kms-transactions-on-steroids: 3/30] backends/native: Move some initialization from init() to initable_init()
- Date: Thu, 20 Jun 2019 13:07:45 +0000 (UTC)
commit db50205b1f3bb6f2a96ce9917f65fc9449034480
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Thu Jan 10 11:54:07 2019 +0100
backends/native: Move some initialization from init() to initable_init()
This means we can report the errors properly, instead of logging a
warning and calling exit(1).
https://gitlab.gnome.org/GNOME/mutter/issues/548
https://gitlab.gnome.org/GNOME/mutter/merge_requests/525
src/backends/native/meta-backend-native.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index 50eb7bfc6..30a5d9906 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -527,7 +527,12 @@ meta_backend_native_initable_init (GInitable *initable,
return FALSE;
}
+ native->launcher = meta_launcher_new (error);
+ if (!native->launcher)
+ return FALSE;
+
native->udev = meta_udev_new ();
+ native->barrier_manager = meta_barrier_manager_native_new ();
return initable_parent_iface->init (initable, cancellable, error);
}
@@ -573,16 +578,6 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass)
static void
meta_backend_native_init (MetaBackendNative *native)
{
- GError *error = NULL;
-
- native->launcher = meta_launcher_new (&error);
- if (native->launcher == NULL)
- {
- g_warning ("Can't initialize KMS backend: %s\n", error->message);
- exit (1);
- }
-
- native->barrier_manager = meta_barrier_manager_native_new ();
}
MetaLauncher *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]