isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 11:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

core/events: Don't shadow variable name

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2016-11-29 20:22:02 +08:00
parent ecf796f82b
commit a3f0bf3ff8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/events.c
View File

@ -181,7 +181,7 @@ meta_display_handle_event (MetaDisplay *display,
MetaWindow *window; MetaWindow *window;
gboolean bypass_clutter = FALSE; gboolean bypass_clutter = FALSE;
G_GNUC_UNUSED gboolean bypass_wayland = FALSE; G_GNUC_UNUSED gboolean bypass_wayland = FALSE;
MetaGestureTracker *tracker; MetaGestureTracker *gesture_tracker;
ClutterEventSequence *sequence; ClutterEventSequence *sequence;
ClutterInputDevice *source; ClutterInputDevice *source;
@ -254,8 +254,11 @@ meta_display_handle_event (MetaDisplay *display,
} }
else else
{ {
MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL); MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
meta_cursor_tracker_update_position (cursor_tracker,
event->motion.x,
event->motion.y);
} }
display->monitor_cache_invalidated = TRUE; 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; bypass_wayland = bypass_clutter = TRUE;
goto out; goto out;