unity-2d

Merge lp:~gerboland/unity-2d/auto-restart-on-cancelled-logout-fix into lp:unity-2d

  1. auto-restart-on-cancelled-logout-fix
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Florian Boucault
Approved revision: 728
Merged at revision: 728
Proposed branch: lp:~gerboland/unity-2d/auto-restart-on-cancelled-logout-fix
Merge into: lp:unity-2d
Diff against target: 19 lines (+2/-0)
2 files modified
launcher/app/unity-2d-launcher.desktop (+1/-0)
panel/app/unity-2d-panel.desktop (+1/-0)
To merge this branch: bzr merge lp:~gerboland/unity-2d/auto-restart-on-cancelled-logout-fix
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Review via email: mp+76063@code.launchpad.net

Description of the change

[panel][launcher] Should logout be cancelled, have Panel and Launcher restart to return a usable desktop. Fix by setting X-GNOME-Autostart-Phase in desktop file.

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 'launcher/app/unity-2d-launcher.desktop'
2--- launcher/app/unity-2d-launcher.desktop 2011-05-18 11:53:52 +0000
3+++ launcher/app/unity-2d-launcher.desktop 2011-09-19 16:34:24 +0000
4@@ -9,4 +9,5 @@
5 NoDisplay=true
6 X-Ubuntu-Gettext-Domain=unity-2d-launcher
7 X-GNOME-Autostart-Notify=false
8+X-GNOME-Autostart-Phase=Panel
9 X-GNOME-AutoRestart=true
10
11=== modified file 'panel/app/unity-2d-panel.desktop'
12--- panel/app/unity-2d-panel.desktop 2011-05-18 11:53:52 +0000
13+++ panel/app/unity-2d-panel.desktop 2011-09-19 16:34:24 +0000
14@@ -9,4 +9,5 @@
15 NoDisplay=true
16 X-Ubuntu-Gettext-Domain=unity-2d-panel
17 X-GNOME-Autostart-Notify=false
18+X-GNOME-Autostart-Phase=Panel
19 X-GNOME-AutoRestart=true

Subscribers

People subscribed via source and target branches