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
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);