Unity

Merge lp:~3v1n0/unity/close-shtudown-on-lock-request into lp:unity

  1. close-shtudown-on-lock-request
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4020
Proposed branch: lp:~3v1n0/unity/close-shtudown-on-lock-request
Merge into: lp:unity
Diff against target: 36 lines (+12/-0) (has conflicts)
2 files modified
debian/changelog (+9/-0)
plugins/unityshell/src/unityshell.cpp (+3/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~3v1n0/unity/close-shtudown-on-lock-request
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Azzarone (community) Approve
Review via email: mp+274145@code.launchpad.net

Commit message

UnityScreen: close the session dialog in case it's open and we're requested to lock

Otherwise a grab conflict will will cause the lockscreen not to show up.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

\o/

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

FAILED: Continuous integration, rev:4009
http://jenkins.qa.ubuntu.com/job/unity-ci/1317/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/93
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/93/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1317/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 'debian/changelog'
2--- debian/changelog 2015-10-02 14:02:10 +0000
3+++ debian/changelog 2015-10-15 16:00:59 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 unity (7.3.2+15.10.20151002.2-0ubuntu1) wily; urgency=medium
7
8 * GnomeKeyGrabber: Don't allow an action to be grabbed multiple times
9@@ -34,6 +35,14 @@
10
11 -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 21 Sep 2015 17:44:10 +0000
12
13+=======
14+unity (7.3.2+15.10.20151014-0ubuntu1) UNRELEASED; urgency=medium
15+
16+ * Sync changelog with proposed
17+
18+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 15 Oct 2015 16:59:50 +0100
19+
20+>>>>>>> MERGE-SOURCE
21 unity (7.3.2+15.10.20150910.1-0ubuntu1) wily; urgency=medium
22
23 [ Andrea Azzarone andrea.azzarone@canonical.com ]
24
25=== modified file 'plugins/unityshell/src/unityshell.cpp'
26--- plugins/unityshell/src/unityshell.cpp 2015-09-16 15:12:48 +0000
27+++ plugins/unityshell/src/unityshell.cpp 2015-10-15 16:00:59 +0000
28@@ -3846,6 +3846,9 @@
29 if (hud_controller_->IsVisible())
30 hud_controller_->HideHud();
31
32+ if (session_controller_->Visible())
33+ session_controller_->Hide();
34+
35 menus_->Indicators()->CloseActiveEntry();
36 launcher_controller_->ClearTooltips();
37