AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

longpress: fix reentrancy on ::reset()

Browse Source
This commit is contained in:
Carlos Garnacho 2014-04-08 21:10:43 +02:00
parent 3cc9543e64
commit c506dfe600
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkgesturelongpress.c
View File

@ -130,9 +130,9 @@ gtk_gesture_long_press_update (GtkGesture *gesture,
{ {
if (priv->timeout_id) if (priv->timeout_id)
{ {
g_signal_emit (gesture, signals[CANCELLED], 0);
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
g_signal_emit (gesture, signals[CANCELLED], 0);
} }
priv->cancelled = TRUE; priv->cancelled = TRUE;
@ -149,10 +149,9 @@ gtk_gesture_long_press_end (GtkGesture *gesture,
if (priv->timeout_id) if (priv->timeout_id)
{ {
if (!priv->triggered)
g_signal_emit (gesture, signals[CANCELLED], 0);
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
g_signal_emit (gesture, signals[CANCELLED], 0);
} }
priv->cancelled = priv->triggered = FALSE; priv->cancelled = priv->triggered = FALSE;
@ -163,15 +162,8 @@ gtk_gesture_long_press_sequence_state_changed (GtkGesture *gesture,
GdkEventSequence *sequence, GdkEventSequence *sequence,
GtkEventSequenceState state) GtkEventSequenceState state)
{ {
GtkGestureLongPressPrivate *priv;
priv = gtk_gesture_long_press_get_instance_private (GTK_GESTURE_LONG_PRESS (gesture));
if (state == GTK_EVENT_SEQUENCE_DENIED) if (state == GTK_EVENT_SEQUENCE_DENIED)
{ gtk_gesture_long_press_end (gesture, sequence);
gtk_gesture_long_press_end (gesture, sequence);
priv->cancelled = TRUE;
}
} }
static void static void