[clutter/clutter-1.16] gesture-action: avoid shadowing time() syscall function
- From: Lionel Landwerlin <llandwerlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] gesture-action: avoid shadowing time() syscall function
- Date: Tue, 23 Apr 2013 16:38:15 +0000 (UTC)
commit 82e5634117c23db033b3a9c62217a15d66a9267a
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Sun Apr 7 16:12:32 2013 +0100
gesture-action: avoid shadowing time() syscall function
https://bugzilla.gnome.org/show_bug.cgi?id=698668
clutter/clutter-gesture-action.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index 751555a..27eb1a5 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -291,7 +291,7 @@ stage_captured_event_cb (ClutterActor *stage,
gboolean return_value;
GesturePoint *point;
gfloat motion_x, motion_y;
- gint64 time;
+ gint64 _time;
if ((point = gesture_find_point (action, event, &position)) == NULL)
return CLUTTER_EVENT_PROPAGATE;
@@ -347,9 +347,9 @@ stage_captured_event_cb (ClutterActor *stage,
point->last_motion_x = motion_x;
point->last_motion_y = motion_y;
- time = clutter_event_get_time (event);
- point->last_delta_time = time - point->last_motion_time;
- point->last_motion_time = time;
+ _time = clutter_event_get_time (event);
+ point->last_delta_time = _time - point->last_motion_time;
+ point->last_motion_time = _time;
g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor,
&return_value);
@@ -384,8 +384,8 @@ stage_captured_event_cb (ClutterActor *stage,
/* Treat the release event as the continuation of the last motion,
* in case the user keeps the pointer still for a while before
* releasing it. */
- time = clutter_event_get_time (event);
- point->last_delta_time += time - point->last_motion_time;
+ _time = clutter_event_get_time (event);
+ point->last_delta_time += _time - point->last_motion_time;
priv->in_gesture = FALSE;
g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]