From db497a2ecfccc8ad9284353826f32fc75ca78ecd Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Jul 2013 14:17:39 +0200
Subject: [PATCH] shellDBus: Export the timestamp of shortcuts through D-Bus

So that apps launched through gnome-settings-daemon can get
focused properly.

https://bugzilla.gnome.org/show_bug.cgi?id=704859
---
 js/ui/shellDBus.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 84597fd93..0099978d6 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -41,6 +41,7 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
 <signal name="AcceleratorActivated">
     <arg name="action" type="u" />
     <arg name="deviceid" type="u" />
+    <arg name="timestamp" type="u" />
 </signal>
 <property name="Mode" type="s" access="read" />
 <property name="OverviewActive" type="b" access="readwrite" />
@@ -79,8 +80,8 @@ const GnomeShell = new Lang.Class({
         this._grabbers = new Hash.Map();
 
         global.display.connect('accelerator-activated', Lang.bind(this,
-            function(display, action, deviceid) {
-                this._emitAcceleratorActivated(action, deviceid);
+            function(display, action, deviceid, timestamp) {
+                this._emitAcceleratorActivated(action, deviceid, timestamp);
             }));
     },
 
@@ -166,7 +167,7 @@ const GnomeShell = new Lang.Class({
         return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
     },
 
-    _emitAcceleratorActivated: function(action, deviceid) {
+    _emitAcceleratorActivated: function(action, deviceid, timestamp) {
         let destination = this._grabbedAccelerators.get(action);
         if (!destination)
             return;
@@ -177,7 +178,7 @@ const GnomeShell = new Lang.Class({
                                this._dbusImpl.get_object_path(),
                                info ? info.name : null,
                                'AcceleratorActivated',
-                               GLib.Variant.new('(uu)', [action, deviceid]));
+                               GLib.Variant.new('(uuu)', [action, deviceid, timestamp]));
     },
 
     _grabAcceleratorForSender: function(accelerator, flags, sender) {