From 01eaaac79af284a37b61dbf8b2730c7fe26c461e Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 12 Nov 2013 20:19:57 -0500
Subject: [PATCH] westoy: Remove window_touch_move

It seems to be the same as window_move, except it ignores the passed
in serial (???) and instead just uses the one of the display.
---
 clients/flower.c      |  3 +--
 clients/fullscreen.c  |  3 +--
 clients/transformed.c |  3 +--
 clients/window.c      | 10 ----------
 clients/window.h      |  2 --
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/clients/flower.c b/clients/flower.c
index 825c833..389f8be 100644
--- a/clients/flower.c
+++ b/clients/flower.c
@@ -158,8 +158,7 @@ touch_down_handler(struct widget *widget, struct input *input,
 		   float x, float y, void *data)
 {
 	struct flower *flower = data;
-	window_touch_move(flower->window, input, 
-			  display_get_serial(flower->display));
+	window_move(flower->window, input, display_get_serial(flower->display));
 }
 
 int main(int argc, char *argv[])
diff --git a/clients/fullscreen.c b/clients/fullscreen.c
index 72e2c81..034a352 100644
--- a/clients/fullscreen.c
+++ b/clients/fullscreen.c
@@ -283,8 +283,7 @@ touch_handler(struct widget *widget, struct input *input,
 		   float x, float y, void *data)
 {
 	struct fullscreen *fullscreen = data;
-	window_touch_move(fullscreen->window, input, 
-			  display_get_serial(fullscreen->display));
+	window_move(fullscreen->window, input, display_get_serial(fullscreen->display));
 }
 
 static void
diff --git a/clients/transformed.c b/clients/transformed.c
index 54212dd..bbc1dc0 100644
--- a/clients/transformed.c
+++ b/clients/transformed.c
@@ -227,8 +227,7 @@ touch_handler(struct widget *widget, struct input *input,
 		   float x, float y, void *data)
 {
 	struct transformed *transformed = data;
-	window_touch_move(transformed->window, input, 
-			  display_get_serial(transformed->display));
+	window_move(transformed->window, input, display_get_serial(transformed->display));
 }
 
 static void
diff --git a/clients/window.c b/clients/window.c
index b703656..0afd46b 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3590,16 +3590,6 @@ window_move(struct window *window, struct input *input, uint32_t serial)
 	wl_shell_surface_move(window->shell_surface, input->seat, serial);
 }
 
-void
-window_touch_move(struct window *window, struct input *input, uint32_t serial)
-{
-	if (!window->shell_surface)
-		return;
-
-	wl_shell_surface_move(window->shell_surface, input->seat, 
-			      window->display->serial);
-}
-
 static void
 surface_set_synchronized(struct surface *surface)
 {
diff --git a/clients/window.h b/clients/window.h
index ff7c87b..59e483e 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -333,8 +333,6 @@ window_get_display(struct window *window);
 void
 window_move(struct window *window, struct input *input, uint32_t time);
 void
-window_touch_move(struct window *window, struct input *input, uint32_t time);
-void
 window_get_allocation(struct window *window, struct rectangle *allocation);
 void
 window_schedule_redraw(struct window *window);
-- 
2.7.4