[gnome-settings-daemon/gnome-3-8] Revert "media-keys: Work-around launched apps not getting focused"

[Bastien Nocera <hadess src gnome org>]

commit 39c2687c66ca212829efd29a49eeb4e5847896c7
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jul 26 20:05:55 2013 +0200

    Revert "media-keys: Work-around launched apps not getting focused"
    
    This reverts commit 5ed4d73797d11b97ecaf614c3006dff4cdd4a8a6.

 plugins/media-keys/gsd-media-keys-manager.c |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index fd3bcda..93cf14e 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2104,17 +2104,6 @@ do_action (GsdMediaKeysManager *manager,
         return FALSE;
 }
 
-static guint
-get_timestamp (void)
-{
-       GdkWindow *window;
-       GdkDisplayManager *manager;
-
-       manager = gdk_display_manager_get ();
-       window = gdk_x11_window_lookup_for_display (gdk_display_manager_get_default_display(manager), 
GDK_ROOT_WINDOW());
-       return gdk_x11_get_server_time (window);
-}
-
 static void
 on_accelerator_activated (ShellKeyGrabber     *grabber,
                           guint                accel_id,
@@ -2122,7 +2111,6 @@ on_accelerator_activated (ShellKeyGrabber     *grabber,
                           GsdMediaKeysManager *manager)
 {
         guint i;
-        guint timestamp;
 
         for (i = 0; i < manager->priv->keys->len; i++) {
                 MediaKey *key;
@@ -2132,12 +2120,10 @@ on_accelerator_activated (ShellKeyGrabber     *grabber,
                 if (key->accel_id != accel_id)
                         continue;
 
-                timestamp = get_timestamp ();
-
                 if (key->key_type == CUSTOM_KEY)
-                        do_custom_action (manager, deviceid, key, timestamp);
+                        do_custom_action (manager, deviceid, key, GDK_CURRENT_TIME);
                 else
-                        do_action (manager, deviceid, key->key_type, timestamp);
+                        do_action (manager, deviceid, key->key_type, GDK_CURRENT_TIME);
                 return;
         }
 }