brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gesture-action: avoid shadowing time() syscall function

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=698668
This commit is contained in:
Lionel Landwerlin 2013-04-07 16:12:32 +01:00
parent 1ee07e5d48
commit ed92f63f30
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter-gesture-action.c
View File

@ -289,7 +289,7 @@ stage_captured_event_cb (ClutterActor *stage,
gboolean return_value; gboolean return_value;
GesturePoint *point; GesturePoint *point;
gfloat motion_x, motion_y; gfloat motion_x, motion_y;
gint64 time; gint64 _time;
if ((point = gesture_find_point (action, event, &position)) == NULL) if ((point = gesture_find_point (action, event, &position)) == NULL)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
@ -345,9 +345,9 @@ stage_captured_event_cb (ClutterActor *stage,
point->last_motion_x = motion_x; point->last_motion_x = motion_x;
point->last_motion_y = motion_y; point->last_motion_y = motion_y;
time = clutter_event_get_time (event); _time = clutter_event_get_time (event);
point->last_delta_time = time - point->last_motion_time; point->last_delta_time = _time - point->last_motion_time;
point->last_motion_time = time; point->last_motion_time = _time;
g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor, g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor,
&return_value); &return_value);
@ -382,8 +382,8 @@ stage_captured_event_cb (ClutterActor *stage,
/* Treat the release event as the continuation of the last motion, /* Treat the release event as the continuation of the last motion,
* in case the user keeps the pointer still for a while before * in case the user keeps the pointer still for a while before
* releasing it. */ * releasing it. */
time = clutter_event_get_time (event); _time = clutter_event_get_time (event);
point->last_delta_time += time - point->last_motion_time; point->last_delta_time += _time - point->last_motion_time;
priv->in_gesture = FALSE; priv->in_gesture = FALSE;
g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor); g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor);