[mutter] core/events: Don't shadow variable name
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] core/events: Don't shadow variable name
- Date: Wed, 25 Jan 2017 08:30:58 +0000 (UTC)
commit a3f0bf3ff8d92805ee5bbdbbb7ed890eb326209b
Author: Jonas Ådahl <jadahl gmail com>
Date: Tue Nov 29 20:22:02 2016 +0800
core/events: Don't shadow variable name
Don't use the same variable name for two different things (gesture
tracker vs cursor tracker).
https://bugzilla.gnome.org/show_bug.cgi?id=777732
src/core/events.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/core/events.c b/src/core/events.c
index 1edff87..2a44b20 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -181,7 +181,7 @@ meta_display_handle_event (MetaDisplay *display,
MetaWindow *window;
gboolean bypass_clutter = FALSE;
G_GNUC_UNUSED gboolean bypass_wayland = FALSE;
- MetaGestureTracker *tracker;
+ MetaGestureTracker *gesture_tracker;
ClutterEventSequence *sequence;
ClutterInputDevice *source;
@@ -254,8 +254,11 @@ meta_display_handle_event (MetaDisplay *display,
}
else
{
- MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
- meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
+ MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
+
+ meta_cursor_tracker_update_position (cursor_tracker,
+ event->motion.x,
+ event->motion.y);
}
display->monitor_cache_invalidated = TRUE;
@@ -290,9 +293,9 @@ meta_display_handle_event (MetaDisplay *display,
}
}
- tracker = meta_display_get_gesture_tracker (display);
+ gesture_tracker = meta_display_get_gesture_tracker (display);
- if (meta_gesture_tracker_handle_event (tracker, event))
+ if (meta_gesture_tracker_handle_event (gesture_tracker, event))
{
bypass_wayland = bypass_clutter = TRUE;
goto out;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]