Session Menu

Merge lp:~azzar1/indicator-session/proper-shutdown into lp:indicator-session/15.10

  1. proper-shutdown
  2. Merge into trunk.15.10
Proposed by Andrea Azzarone
Status: Work in progress
Proposed branch: lp:~azzar1/indicator-session/proper-shutdown
Merge into: lp:indicator-session/15.10
Diff against target: 14 lines (+1/-3)
1 file modified
src/backend-dbus/actions.c (+1/-3)
To merge this branch: bzr merge lp:~azzar1/indicator-session/proper-shutdown
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+275054@code.launchpad.net

Commit message

Properly handle shutdown dialog in unity.

Description of the change

Properly handle shutdown dialog in unity.

To post a comment you must log in.
lp:~azzar1/indicator-session/proper-shutdown updated
468. By Andrea Azzarone

Merge with trunk.

Unmerged revisions

468. By Andrea Azzarone

Merge with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/backend-dbus/actions.c'
2--- src/backend-dbus/actions.c 2015-08-27 15:07:19 +0000
3+++ src/backend-dbus/actions.c 2016-01-25 16:26:11 +0000
4@@ -788,9 +788,7 @@
5 switch (get_prompt_status (self))
6 {
7 case PROMPT_WITH_UNITY:
8- /* NB: TYPE_REBOOT instead of TYPE_SHUTDOWN because
9- the latter adds lock & logout options in Unity... */
10- show_unity_end_session_dialog (self, END_SESSION_TYPE_REBOOT);
11+ show_unity_end_session_dialog (self, END_SESSION_TYPE_SHUTDOWN);
12 break;
13
14 case PROMPT_WITH_ZENITY:

Subscribers

People subscribed via source and target branches