[weston,v3,14/17] tablet: Fixed compilation errors resulting from tablet patches.

Submitted by Maniraj Devadoss on Dec. 19, 2017, 8:33 a.m.

Details

Message ID 1513672422-6010-15-git-send-email-Maniraj.Devadoss@in.bosch.com
State New
Headers show
Series "Tablet device support for weston" ( rev: 3 ) in Wayland

Not browsing as part of any series.

Commit Message

Maniraj Devadoss Dec. 19, 2017, 8:33 a.m.
From: Bastian Farkas <bfarkas@de.adit-jv.com>

Member names of struct weston_surfece were changed from configure to committed.

Signed-off-by: Bastian Farkas <bfarkas@de.adit-jv.com>
---
 libweston/input.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libweston/input.c b/libweston/input.c
index d8251b1..778aabd 100644
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -1523,8 +1523,8 @@  tablet_tool_unmap_sprite(struct weston_tablet_tool *tool)
 		weston_surface_unmap(tool->sprite->surface);
 
 	wl_list_remove(&tool->sprite_destroy_listener.link);
-	tool->sprite->surface->configure = NULL;
-	tool->sprite->surface->configure_private = NULL;
+	tool->sprite->surface->committed = NULL;
+	tool->sprite->surface->committed_private = NULL;
 	weston_view_destroy(tool->sprite);
 	tool->sprite = NULL;
 }
@@ -2788,7 +2788,7 @@  static void
 tablet_tool_cursor_surface_configure(struct weston_surface *es,
 				     int32_t dx, int32_t dy)
 {
-	struct weston_tablet_tool *tool = es->configure_private;
+	struct weston_tablet_tool *tool = es->committed_private;
 	int x, y;
 
 	if (es->width == 0)
@@ -2842,7 +2842,7 @@  tablet_tool_set_cursor(struct wl_client *client, struct wl_resource *resource,
 		return;
 
 	if (surface && tool->sprite && surface != tool->sprite->surface &&
-	    surface->configure) {
+	    surface->committed) {
 		wl_resource_post_error(surface->resource,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
 				       "surface->configure already set");
@@ -2857,8 +2857,8 @@  tablet_tool_set_cursor(struct wl_client *client, struct wl_resource *resource,
 
 	wl_signal_add(&surface->destroy_signal,
 		      &tool->sprite_destroy_listener);
-	surface->configure = tablet_tool_cursor_surface_configure;
-	surface->configure_private = tool;
+	surface->committed = tablet_tool_cursor_surface_configure;
+	surface->committed_private = tool;
 	tool->sprite = weston_view_create(surface);
 	tool->hotspot_x = hotspot_x;
 	tool->hotspot_y = hotspot_y;