Merge lp:~seb128/unity-settings-daemon/timestamp-for-commands into lp:unity-settings-daemon

Proposed by Sebastien Bacher on 2015-03-18
Status: Merged
Approved by: Iain Lane on 2015-03-18
Approved revision: 4077
Merged at revision: 4077
Proposed branch: lp:~seb128/unity-settings-daemon/timestamp-for-commands
Merge into: lp:unity-settings-daemon
Diff against target: 48 lines (+5/-3)
3 files modified
debian/control (+1/-1)
plugins/media-keys/gsd-media-keys-manager.c (+3/-2)
plugins/media-keys/org.gnome.ShellKeyGrabber.xml (+1/-0)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/timestamp-for-commands
Reviewer Review Type Date Requested Status
Iain Lane 2015-03-18 Approve on 2015-03-18
PS Jenkins bot (community) continuous-integration Approve on 2015-03-18
Review via email: mp+253394@code.launchpad.net

Commit message

use timestamp provided by compiz to run keybinding commands so focus works

Description of the change

use timestamp provided by compiz to run keybinding commands so focus works

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-03-12 21:34:36 +0000
3+++ debian/control 2015-03-18 16:32:47 +0000
4@@ -69,7 +69,7 @@
5 gnome-session (<< 3.9.90-0ubuntu6),
6 gnome-screensaver (<< 2.28.0),
7 gnome-color-manager (<< 3.0),
8- unity (<< 7.1.2+14.04.20140214.1-0ubuntu1),
9+ unity (<< 7.3.2),
10 unity-greeter (<< 0.2.1-0ubuntu1),
11 indicator-datetime (<< 12.10.3daily13.03.26)
12 Suggests: x11-xserver-utils,
13
14=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
15--- plugins/media-keys/gsd-media-keys-manager.c 2015-03-18 11:08:48 +0000
16+++ plugins/media-keys/gsd-media-keys-manager.c 2015-03-18 16:32:47 +0000
17@@ -2734,6 +2734,7 @@
18 on_accelerator_activated (ShellKeyGrabber *grabber,
19 guint accel_id,
20 guint deviceid,
21+ guint timestamp,
22 GsdMediaKeysManager *manager)
23 {
24 guint i;
25@@ -2747,9 +2748,9 @@
26 continue;
27
28 if (key->key_type == CUSTOM_KEY)
29- do_custom_action (manager, deviceid, key, GDK_CURRENT_TIME);
30+ do_custom_action (manager, deviceid, key, timestamp);
31 else
32- do_action (manager, deviceid, key->key_type, GDK_CURRENT_TIME);
33+ do_action (manager, deviceid, key->key_type, timestamp);
34 return;
35 }
36 }
37
38=== modified file 'plugins/media-keys/org.gnome.ShellKeyGrabber.xml'
39--- plugins/media-keys/org.gnome.ShellKeyGrabber.xml 2013-03-01 16:10:48 +0000
40+++ plugins/media-keys/org.gnome.ShellKeyGrabber.xml 2015-03-18 16:32:47 +0000
41@@ -17,6 +17,7 @@
42 <signal name="AcceleratorActivated">
43 <arg type="u" name="action"/>
44 <arg type="u" name="device"/>
45+ <arg type="u" name="timestamp"/>
46 </signal>
47 </interface>
48 </node>

Subscribers

People subscribed via source and target branches