summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-07-25 14:18:55 +0200
committerBastien Nocera <hadess@hadess.net>2013-07-25 14:55:58 +0200
commit487a936e61766f0306772c1269e2ff437fc53a46 (patch)
tree141999775e96949d5de1dac3a41e47147b2812dc /plugins
parent8abc8d37402fb6018e1c2a8b05a75b5c613cd179 (diff)
downloadgnome-settings-daemon-487a936e61766f0306772c1269e2ff437fc53a46.tar.gz
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
Diffstat (limited to 'plugins')
-rw-r--r--plugins/media-keys/gsd-media-keys-manager.c5
-rw-r--r--plugins/media-keys/org.gnome.ShellKeyGrabber.xml1
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 9d463d8d..6bae5e34 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 7b60959d..b47e9c87 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>