Unity Settings Daemon

Merge lp:~laney/unity-settings-daemon/always-gnome-screenshot into lp:unity-settings-daemon

  1. always-gnome-screenshot
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4018
Merged at revision: 4018
Proposed branch: lp:~laney/unity-settings-daemon/always-gnome-screenshot
Merge into: lp:unity-settings-daemon
Diff against target: 52 lines (+19/-23)
1 file modified
plugins/media-keys/gsd-media-keys-manager.c (+19/-23)
To merge this branch: bzr merge lp:~laney/unity-settings-daemon/always-gnome-screenshot
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Sebastien Bacher Approve
Unity Settings Daemon Development Team Pending
Review via email: mp+207628@code.launchpad.net

Commit message

Always use gnome-screenshot directly, not the gnome-shell screenshot interface. We aren't using the legacy keygrabber under Unity, but neither can we use gnome-shell's interface since Unity doesn't implement it.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

That seems right indeed

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4018
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/15/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
2--- plugins/media-keys/gsd-media-keys-manager.c 2014-02-18 18:22:53 +0000
3+++ plugins/media-keys/gsd-media-keys-manager.c 2014-02-21 11:42:24 +0000
4@@ -2344,29 +2344,25 @@
5 do_screenshot_action (GsdMediaKeysManager *manager,
6 MediaKeyType type)
7 {
8- if (!manager->priv->have_legacy_keygrabber)
9- gsd_screenshot_take (type);
10- else {
11- switch (type){
12- case SCREENSHOT_KEY:
13- execute (manager, "gnome-screenshot", FALSE);
14- break;
15- case WINDOW_SCREENSHOT_KEY:
16- execute (manager, "gnome-screenshot --window", FALSE);
17- break;
18- case AREA_SCREENSHOT_KEY:
19- execute (manager, "gnome-screenshot --area", FALSE);
20- break;
21- case SCREENSHOT_CLIP_KEY:
22- execute (manager, "gnome-screenshot --clipboard", FALSE);
23- break;
24- case WINDOW_SCREENSHOT_CLIP_KEY:
25- execute (manager, "gnome-screenshot --window --clipboard", FALSE);
26- break;
27- case AREA_SCREENSHOT_CLIP_KEY:
28- execute (manager, "gnome-screenshot --area --clipboard", FALSE);
29- }
30- }
31+ switch (type){
32+ case SCREENSHOT_KEY:
33+ execute (manager, "gnome-screenshot", FALSE);
34+ break;
35+ case WINDOW_SCREENSHOT_KEY:
36+ execute (manager, "gnome-screenshot --window", FALSE);
37+ break;
38+ case AREA_SCREENSHOT_KEY:
39+ execute (manager, "gnome-screenshot --area", FALSE);
40+ break;
41+ case SCREENSHOT_CLIP_KEY:
42+ execute (manager, "gnome-screenshot --clipboard", FALSE);
43+ break;
44+ case WINDOW_SCREENSHOT_CLIP_KEY:
45+ execute (manager, "gnome-screenshot --window --clipboard", FALSE);
46+ break;
47+ case AREA_SCREENSHOT_CLIP_KEY:
48+ execute (manager, "gnome-screenshot --area --clipboard", FALSE);
49+ }
50 }
51
52 static void

Subscribers

People subscribed via source and target branches