Revert "desktop: No need to schedule a compositor repaint"

[src/agl-compositor.git] / src / desktop.c

diff --git a/src/desktop.c b/src/desktop.c
index 255b182..01e4539 100644 (file)
--- 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);
 }