summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-07-08 16:23:26 +0200
committerCarlos Garnacho <carlosg@gnome.org>2019-07-08 16:30:16 +0200
commit78560b84263254e5e9dcbd3b8b7610cd9f3756a0 (patch)
tree7addf8b02f6a8744f85d6920d309cf432e2a7a53 /src
parent0eab73dc2e28a52d9c01a2c6e30e32125d0048a7 (diff)
downloadmutter-78560b84263254e5e9dcbd3b8b7610cd9f3756a0.tar.gz
core: Use source device on ::accelerator-activated
Using the master device, as we did, won't yield the expected result when looking up the device node (it comes NULL as this is a virtual device). Use the slave device, as the g-s-d machinery essentially expects. https://gitlab.gnome.org/GNOME/mutter/merge_requests/678
Diffstat (limited to 'src')
-rw-r--r--src/core/display.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/display.c b/src/core/display.c
index 1d06863eb..4f56673b9 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2621,8 +2621,10 @@ meta_display_accelerator_activate (MetaDisplay *display,
guint action,
ClutterKeyEvent *event)
{
- g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
- 0, action, event->device, event->time);
+ g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED], 0,
+ action,
+ clutter_event_get_source_device ((ClutterEvent *) event),
+ event->time);
}
gboolean