compositor: Rename activated_by_default to mapped

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

diff --git a/src/desktop.c b/src/desktop.c
index a0cb2d2..efebfc1 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -134,7 +134,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        surface->ivi = ivi;
        surface->dsurface = dsurface;
        surface->role = IVI_SURFACE_ROLE_NONE;
-       surface->activated_by_default = false;
+       surface->mapped = false;
        surface->advertised_on_launch = false;
        surface->checked_pending = false;
        wl_list_init(&surface->link);
@@ -442,7 +442,9 @@ 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_compositor_destroy_pending_surfaces(ivi);
+       wl_list_remove(&listener->link);
 }
 
 int