[PATCH weston v3 11/15] ivi-shell: create weston_desktop in wet_shell_init
Michael Teyfel
mteyfel at de.adit-jv.com
Tue Apr 10 09:06:04 UTC 2018
Signed-off-by: Michael Teyfel <mteyfel at de.adit-jv.com>
---
ivi-shell/ivi-shell.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 160c41c..55283a9 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -644,16 +644,23 @@ wet_shell_init(struct weston_compositor *compositor,
if (!shell->text_backend)
goto err_shell;
+ shell->desktop = weston_desktop_create(compositor, &shell_desktop_api, shell);
+ if (!shell->desktop)
+ goto err_text_backend;
+
if (wl_global_create(compositor->wl_display,
&ivi_application_interface, 1,
shell, bind_ivi_application) == NULL)
- goto err_text_backend;
+ goto err_desktop;
ivi_layout_init_with_compositor(compositor);
shell_add_bindings(compositor, shell);
return IVI_SUCCEEDED;
+err_desktop:
+ weston_desktop_destroy(shell->desktop);
+
err_text_backend:
text_backend_destroy(shell->text_backend);
--
2.7.4
More information about the wayland-devel
mailing list