gtkscrolledwindow: Avoid gtk_gesture_set_sequence_state()

This widget does not require special knowledge about the ongoing
event sequences, just make it use gtk_gesture_set_state() generically.

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 4e497c1178c894d9ee3276d57d22ee5eacff82b8..b47eb33a8924b2abdd5454fe5d776890ee128585 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -915,7 +915,7 @@ scrolled_window_drag_begin_cb (GtkScrolledWindow *scrolled_window,
 
   if (event_widget == priv->vscrollbar || event_widget == priv->hscrollbar ||
       (!may_hscroll (scrolled_window) && !may_vscroll (scrolled_window)))
-    gtk_gesture_set_sequence_state (gesture, sequence, GTK_EVENT_SEQUENCE_DENIED);
+    gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
 }
 
 static void
@@ -1033,11 +1033,7 @@ scrolled_window_long_press_cb (GtkScrolledWindow *scrolled_window,
                                double             y,
                                GtkGesture        *gesture)
 {
-  GdkEventSequence *sequence;
-
-  sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
-  gtk_gesture_set_sequence_state (gesture, sequence,
-                                  GTK_EVENT_SEQUENCE_DENIED);
+  gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
 }
 
 static void
@@ -1055,8 +1051,7 @@ scrolled_window_long_press_cancelled_cb (GtkScrolledWindow *scrolled_window,
 
   if (event_type == GDK_TOUCH_BEGIN ||
       event_type == GDK_BUTTON_PRESS)
-    gtk_gesture_set_sequence_state (gesture, sequence,
-                                    GTK_EVENT_SEQUENCE_DENIED);
+    gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
   else if (event_type != GDK_TOUCH_END &&
            event_type != GDK_BUTTON_RELEASE)
     priv->in_drag = TRUE;