[mutter/wip/carlosg/accelerators-with-device: 9/9] core: Emit ::accelerator-activated with a ClutterInputDevice argument

[Florian Müllner <fmuellner src gnome org>]

commit dd8c8e82f284df581d844f8d6ceb372e85bdf7c5
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jul 8 11:42:06 2019 +0200

    core: Emit ::accelerator-activated with a ClutterInputDevice argument
    
    The device ID is kind of pointless on Wayland, so it might be better to
    stick to something that works for both backends. Passing the device here
    allows the higher layers to pick.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/676

 src/core/display.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 8e3f93a42..1d06863eb 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -257,7 +257,7 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL, NULL,
-                  G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
+                  G_TYPE_NONE, 3, G_TYPE_UINT, CLUTTER_TYPE_INPUT_DEVICE, G_TYPE_UINT);
 
   /**
    * MetaDisplay::modifiers-accelerator-activated:
@@ -2622,9 +2622,7 @@ meta_display_accelerator_activate (MetaDisplay     *display,
                                    ClutterKeyEvent *event)
 {
   g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
-                 0, action,
-                 clutter_input_device_get_device_id (event->device),
-                 event->time);
+                 0, action, event->device, event->time);
 }
 
 gboolean