|
|
|
@ -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); |
|
|
|
|
|
|
|
|
|