From 2763b66d31594ff30102b6d791d499531f38a0cc Mon Sep 17 00:00:00 2001 From: Michael Teyfel Date: Tue, 17 Oct 2017 11:10:58 +0200 Subject: [PATCH] ivi-shell: create weston_desktop in wet_shell_init Signed-off-by: Michael Teyfel --- 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 e716e2ce..244290b8 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -631,16 +631,23 @@ wet_shell_init(struct weston_compositor *compositor, shell->wake_listener.notify = wake_handler; wl_signal_add(&compositor->wake_signal, &shell->wake_listener); + shell->desktop = weston_desktop_create(compositor, &shell_desktop_api, shell); + if (!shell->desktop) + goto err_shell; + if (wl_global_create(compositor->wl_display, &ivi_application_interface, 1, shell, bind_ivi_application) == NULL) - goto err_shell; + 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_shell: free(shell);