X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=01e4539dbf4103ca9e5013a564e7b5ef572d41f2;hb=5274f6ea9da2f119fb67cf6b531e2db20139b5c8;hp=255b182f3bbb20dbf3fff19fbad2268069a3a6c5;hpb=13ac8bab43fffd002196d3a6760eefaa8944def2;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 255b182..01e4539 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -33,18 +33,6 @@
 
 #include "agl-shell-desktop-server-protocol.h"
 
-#if 0
-static struct weston_output *
-get_default_output(struct weston_compositor *compositor)
-{
-	if (wl_list_empty(&compositor->output_list))
-		return NULL;
-
-	return wl_container_of(compositor->output_list.next,
-			       struct weston_output, link);
-}
-#endif
-
 static void
 desktop_advertise_app(struct wl_listener *listener, void *data)
 {
@@ -463,8 +451,10 @@ ivi_shell_destroy(struct wl_listener *listener, void *data)
 	struct ivi_compositor *ivi = container_of(listener,
 				struct ivi_compositor, destroy_listener);
 
-	weston_desktop_destroy(ivi->desktop);
+	ivi_shell_finalize(ivi);
 	ivi_compositor_destroy_pending_surfaces(ivi);
+
+	weston_desktop_destroy(ivi->desktop);
 	wl_list_remove(&listener->link);
 }