summaryrefslogtreecommitdiff
path: root/libweston-desktop
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-08-16 08:52:46 (GMT)
committerQuentin Glidic <sardemff7+git@sardemff7.net>2016-08-16 09:10:27 (GMT)
commitf01ecee75ae435e50910ca852819ee11b22e3b1a (patch)
treecc94f2c03c04c75cbfdbbf9a8a0aaf05cb90775f /libweston-desktop
parent729c7fa788822e5b0561f992d040e1bb8781cbaf (diff)
downloadweston-f01ecee75ae435e50910ca852819ee11b22e3b1a.tar.gz
weston-f01ecee75ae435e50910ca852819ee11b22e3b1a.tar.xz
libweston-desktop: Rename _destroy_view to _unlink_view
It doesn't destroy the view per se (except for internal surfaces) and require the caller to also destroy the view itself at the appropriate time. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Jonas Ã…dahl <jadahl@gmail.com>
Diffstat (limited to 'libweston-desktop')
-rw-r--r--libweston-desktop/libweston-desktop.h2
-rw-r--r--libweston-desktop/surface.c2
-rw-r--r--libweston-desktop/xwayland.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/libweston-desktop/libweston-desktop.h b/libweston-desktop/libweston-desktop.h
index 0f0e031..f77ab55 100644
--- a/libweston-desktop/libweston-desktop.h
+++ b/libweston-desktop/libweston-desktop.h
@@ -111,7 +111,7 @@ weston_desktop_surface_set_user_data(struct weston_desktop_surface *self,
struct weston_view *
weston_desktop_surface_create_view(struct weston_desktop_surface *surface);
void
-weston_desktop_surface_destroy_view(struct weston_view *view);
+weston_desktop_surface_unlink_view(struct weston_view *view);
void
weston_desktop_surface_propagate_layer(struct weston_desktop_surface *surface);
void
diff --git a/libweston-desktop/surface.c b/libweston-desktop/surface.c
index 42258db..2205107 100644
--- a/libweston-desktop/surface.c
+++ b/libweston-desktop/surface.c
@@ -404,7 +404,7 @@ weston_desktop_surface_create_view(struct weston_desktop_surface *surface)
}
WL_EXPORT void
-weston_desktop_surface_destroy_view(struct weston_view *wview)
+weston_desktop_surface_unlink_view(struct weston_view *wview)
{
struct weston_desktop_surface *surface;
struct weston_desktop_view *view;
diff --git a/libweston-desktop/xwayland.c b/libweston-desktop/xwayland.c
index 6c63483..927afab 100644
--- a/libweston-desktop/xwayland.c
+++ b/libweston-desktop/xwayland.c
@@ -80,7 +80,7 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
if (surface->state != state) {
if (surface->state == XWAYLAND) {
- weston_desktop_surface_destroy_view(surface->view);
+ weston_desktop_surface_unlink_view(surface->view);
surface->view = NULL;
}
@@ -153,7 +153,7 @@ weston_desktop_xwayland_surface_destroy(struct weston_desktop_surface *dsurface,
weston_desktop_api_surface_removed(surface->desktop,
surface->surface);
else if (surface->state == XWAYLAND)
- weston_desktop_surface_destroy_view(surface->view);
+ weston_desktop_surface_unlink_view(surface->view);
free(surface);
}