[gnome-settings-daemon] media-keys: Fix launched apps not getting focused

[Bastien Nocera <hadess src gnome org>]

commit 487a936e61766f0306772c1269e2ff437fc53a46
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jul 25 14:18:55 2013 +0200

    media-keys: Fix launched apps not getting focused
    
    Use the timestamp passed by newer versions of mutter/gnome-shell
    to launch applications. This should make them focus correctly when
    launched.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=701273

 plugins/media-keys/gsd-media-keys-manager.c      |    5 +++--
 plugins/media-keys/org.gnome.ShellKeyGrabber.xml |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 9d463d8..6bae5e3 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2127,6 +2127,7 @@ static void
 on_accelerator_activated (ShellKeyGrabber     *grabber,
                           guint                accel_id,
                           guint                deviceid,
+                          guint                timestamp,
                           GsdMediaKeysManager *manager)
 {
         guint i;
@@ -2140,9 +2141,9 @@ on_accelerator_activated (ShellKeyGrabber     *grabber,
                         continue;
 
                 if (key->key_type == CUSTOM_KEY)
-                        do_custom_action (manager, deviceid, key, GDK_CURRENT_TIME);
+                        do_custom_action (manager, deviceid, key, timestamp);
                 else
-                        do_action (manager, deviceid, key->key_type, GDK_CURRENT_TIME);
+                        do_action (manager, deviceid, key->key_type, timestamp);
                 return;
         }
 }
diff --git a/plugins/media-keys/org.gnome.ShellKeyGrabber.xml 
b/plugins/media-keys/org.gnome.ShellKeyGrabber.xml
index 7b60959..b47e9c8 100644
--- a/plugins/media-keys/org.gnome.ShellKeyGrabber.xml
+++ b/plugins/media-keys/org.gnome.ShellKeyGrabber.xml
@@ -17,6 +17,7 @@
     <signal name="AcceleratorActivated">
       <arg type="u" name="action"/>
       <arg type="u" name="device"/>
+      <arg type="u" name="timestamp"/>
     </signal>
   </interface>
 </node>