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

ivi-shell/input-panel-ivi.c

diff --git a/ivi-shell/input-panel-ivi.c b/ivi-shell/input-panel-ivi.c
index 4c71cc7..b0ab2ba 100644
--- a/ivi-shell/input-panel-ivi.c
+++ b/ivi-shell/input-panel-ivi.c
@@ -167,9 +167,9 @@
 }
 
 static void
-input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
+input_panel_committed(struct weston_surface *surface, int32_t sx, int32_t sy)
 {
-	struct input_panel_surface *ip_surface = surface->configure_private;
+	struct input_panel_surface *ip_surface = surface->committed_private;
 	struct ivi_shell *shell = ip_surface->shell;
 	struct weston_view *view;
 	float x, y;
@@ -202,7 +202,7 @@
 	wl_list_remove(&input_panel_surface->surface_destroy_listener.link);
 	wl_list_remove(&input_panel_surface->link);
 
-	input_panel_surface->surface->configure = NULL;
+	input_panel_surface->surface->committed = NULL;
 	weston_surface_set_label_func(input_panel_surface->surface, NULL);
 	weston_view_destroy(input_panel_surface->view);
 
@@ -212,8 +212,8 @@
 static struct input_panel_surface *
 get_input_panel_surface(struct weston_surface *surface)
 {
-	if (surface->configure == input_panel_configure) {
-		return surface->configure_private;
+	if (surface->committed == input_panel_committed) {
+		return surface->committed_private;
 	} else {
 		return NULL;
 	}
@@ -243,8 +243,8 @@
 	if (!input_panel_surface)
 		return NULL;
 
-	surface->configure = input_panel_configure;
-	surface->configure_private = input_panel_surface;
+	surface->committed = input_panel_committed;
+	surface->committed_private = input_panel_surface;
 	weston_surface_set_label_func(surface, input_panel_get_label);
 
 	input_panel_surface->shell = shell;
@@ -329,7 +329,7 @@
 	if (!ipsurf) {
 		wl_resource_post_error(surface_resource,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "surface->configure already set");
+				       "surface->committed already set");
 		return;
 	}
 

ivi-shell/ivi-shell.c

diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index c996b8f..6bdd238 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -78,17 +78,17 @@
  */
 
 static void
-ivi_shell_surface_configure(struct weston_surface *, int32_t, int32_t);
+ivi_shell_surface_committed(struct weston_surface *, int32_t, int32_t);
 
 static struct ivi_shell_surface *
 get_ivi_shell_surface(struct weston_surface *surface)
 {
 	struct ivi_shell_surface *shsurf;
 
-	if (surface->configure != ivi_shell_surface_configure)
+	if (surface->committed != ivi_shell_surface_committed)
 		return NULL;
 
-	shsurf = surface->configure_private;
+	shsurf = surface->committed_private;
 	assert(shsurf);
 	assert(shsurf->surface == surface);
 
@@ -123,7 +123,7 @@
 }
 
 static void
-ivi_shell_surface_configure(struct weston_surface *surface,
+ivi_shell_surface_committed(struct weston_surface *surface,
 			    int32_t sx, int32_t sy)
 {
 	struct ivi_shell_surface *ivisurf = get_ivi_shell_surface(surface);
@@ -166,8 +166,8 @@
 	ivi_layout_surface_destroy(ivisurf->layout_surface);
 	ivisurf->layout_surface = NULL;
 
-	ivisurf->surface->configure = NULL;
-	ivisurf->surface->configure_private = NULL;
+	ivisurf->surface->committed = NULL;
+	ivisurf->surface->committed_private = NULL;
 	weston_surface_set_label_func(ivisurf->surface, NULL);
 	ivisurf->surface = NULL;
 
@@ -298,8 +298,8 @@
 
 	ivisurf->surface = weston_surface;
 
-	weston_surface->configure = ivi_shell_surface_configure;
-	weston_surface->configure_private = ivisurf;
+	weston_surface->committed = ivi_shell_surface_committed;
+	weston_surface->committed_private = ivisurf;
 	weston_surface_set_label_func(weston_surface,
 				      ivi_shell_surface_get_label);