commit 9e5d7d17a79d61011a0a43db9e071bf6cf5eb500
author Kristian Høgsberg <krh@bitplanet.net> Mon Jul 22 16:31:53 2013 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Thu Jul 25 09:50:34 2013 -0700
tree dad59b2815380ac2f2d4a5b7981578ae1e296f73
parent 97e806f138d161a159dec9cf9352eaed58c02fa5

shell: Remove redundant weston_pointer field from shell_grab

This is already in weston_grab.

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index 7e98831..bcde789 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -236,7 +236,6 @@
 	struct weston_pointer_grab grab;
 	struct shell_surface *shsurf;
 	struct wl_listener shsurf_destroy_listener;
-	struct weston_pointer *pointer;
 };
 
 struct weston_move_grab {
@@ -332,8 +331,6 @@
 	wl_signal_add(&shsurf->destroy_signal,
 		      &grab->shsurf_destroy_listener);
 
-	grab->pointer = pointer;
-
 	weston_pointer_start_grab(pointer, &grab->grab);
 	if (shell->child.desktop_shell) {
 		desktop_shell_send_grab_cursor(shell->child.desktop_shell,
@@ -350,7 +347,7 @@
 	if (grab->shsurf)
 		wl_list_remove(&grab->shsurf_destroy_listener.link);
 
-	weston_pointer_end_grab(grab->pointer);
+	weston_pointer_end_grab(grab->grab.pointer);
 }
 
 static void