meson.build: Upgrade build and headers to libweston7

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

diff --git a/src/desktop.c b/src/desktop.c
index 26569d6..eaace19 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -25,8 +25,8 @@
 
 #include "ivi-compositor.h"
 
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #if 0
 static struct weston_output *
@@ -119,9 +119,9 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        if (weston_surface_is_mapped(wsurface)) {
                weston_desktop_surface_unlink_view(surface->view);
                weston_view_destroy(surface->view);
-               wl_list_remove(&surface->link);
        }
 
+       wl_list_remove(&surface->link);
        free(surface);
 }