commit 2edc3d54627778e4248e924dec2f2d91f2e93ead
author Quentin Glidic <sardemff7+git@sardemff7.net> Fri Aug 12 10:41:33 2016 +0200
committer Quentin Glidic <sardemff7+git@sardemff7.net> Sun Aug 14 09:28:50 2016 +0200
tree 2836377e7d952ac86bf9469f88c5ff62213135f1
parent cde1345d69f207b0b9d88633ad1a5076e48fa692

libweston: Rename weston_surface::configure to ::committed

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Acked-by: Giulio Camuffo <giulio.camuffo@kdab.com>

Differential Revision: https://phabricator.freedesktop.org/D1246

libweston/data-device.c

diff --git a/libweston/data-device.c b/libweston/data-device.c
index 19d3972..cba1e11 100644
--- a/libweston/data-device.c
+++ b/libweston/data-device.c
@@ -449,13 +449,13 @@
 }
 
 static void
-pointer_drag_surface_configure(struct weston_surface *es,
+pointer_drag_surface_committed(struct weston_surface *es,
 			       int32_t sx, int32_t sy)
 {
-	struct weston_pointer_drag *drag = es->configure_private;
+	struct weston_pointer_drag *drag = es->committed_private;
 	struct weston_pointer *pointer = drag->grab.pointer;
 
-	assert(es->configure == pointer_drag_surface_configure);
+	assert(es->committed == pointer_drag_surface_committed);
 
 	drag_surface_configure(&drag->base, pointer, NULL, es, sx, sy);
 }
@@ -468,12 +468,12 @@
 }
 
 static void
-touch_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
+touch_drag_surface_committed(struct weston_surface *es, int32_t sx, int32_t sy)
 {
-	struct weston_touch_drag *drag = es->configure_private;
+	struct weston_touch_drag *drag = es->committed_private;
 	struct weston_touch *touch = drag->grab.touch;
 
-	assert(es->configure == touch_drag_surface_configure);
+	assert(es->committed == touch_drag_surface_committed);
 
 	drag_surface_configure(&drag->base, NULL, touch, es, sx, sy);
 }
@@ -610,7 +610,7 @@
 		if (weston_view_is_mapped(drag->icon))
 			weston_view_unmap(drag->icon);
 
-		drag->icon->surface->configure = NULL;
+		drag->icon->surface->committed = NULL;
 		weston_surface_set_label_func(drag->icon->surface, NULL);
 		pixman_region32_clear(&drag->icon->surface->pending.input);
 		wl_list_remove(&drag->icon_destroy_listener.link);
@@ -919,8 +919,8 @@
 		wl_signal_add(&icon->destroy_signal,
 			      &drag->base.icon_destroy_listener);
 
-		icon->configure = pointer_drag_surface_configure;
-		icon->configure_private = drag;
+		icon->committed = pointer_drag_surface_committed;
+		icon->committed_private = drag;
 		weston_surface_set_label_func(icon,
 					pointer_drag_surface_get_label);
 	} else {
@@ -980,8 +980,8 @@
 		wl_signal_add(&icon->destroy_signal,
 			      &drag->base.icon_destroy_listener);
 
-		icon->configure = touch_drag_surface_configure;
-		icon->configure_private = drag;
+		icon->committed = touch_drag_surface_committed;
+		icon->committed_private = drag;
 		weston_surface_set_label_func(icon,
 					touch_drag_surface_get_label);
 	} else {