Session Menu

Merge lp:~ballogy/indicator-session/gnome-session-reboot into lp:indicator-session/13.04

  1. gnome-session-reboot
  2. Merge into trunk.13.04
Proposed by Balló György
Status: Work in progress
Proposed branch: lp:~ballogy/indicator-session/gnome-session-reboot
Merge into: lp:indicator-session/13.04
Diff against target: 28 lines (+2/-5)
1 file modified
src/session-menu-mgr.c (+2/-5)
To merge this branch: bzr merge lp:~ballogy/indicator-session/gnome-session-reboot
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Disapprove
Review via email: mp+141611@code.launchpad.net

Description of the change

Add "gnome-session-quit --reboot" command.

It is supported since gnome-session version 3.6. [1]

[1] http://git.gnome.org/browse/gnome-session/commit/?id=03f69091b71ad66c1559701efce643b15d0eaed4

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Seems reasonable.

review: Approve
Reply
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Seems like this particular change slipped through the cracks; it was approved but Jenkins never picked it back up.

At this point, it's too late to land in Raring. However, could you please resubmit this against lp:indicator-session; then we'll be able to have that in trunk, possibly SRU, or at least have it in the next release.

review: Disapprove
Reply

Unmerged revisions

381. By Balló György

Add "gnome-session-quit --reboot" command.

It is supported since gnome-session version 3.6.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/session-menu-mgr.c'
2--- src/session-menu-mgr.c 2012-11-16 09:30:53 +0000
3+++ src/session-menu-mgr.c 2013-01-02 13:10:27 +0000
4@@ -44,13 +44,11 @@
5 #define CMD_INFO "gnome-control-center info"
6 #define CMD_SYSTEM_SETTINGS "gnome-control-center"
7 #ifdef HAVE_GTKLOGOUTHELPER
8- #define HAVE_RESTART_CMD TRUE
9 #define CMD_RESTART LIBEXECDIR"/gtk-logout-helper --restart"
10 #define CMD_LOGOUT LIBEXECDIR"/gtk-logout-helper --logout"
11 #define CMD_SHUTDOWN LIBEXECDIR"/gtk-logout-helper --shutdown"
12 #else
13- #define HAVE_RESTART_CMD FALSE /* hmm, no gnome-session-quit --restart? */
14- #define CMD_RESTART ""
15+ #define CMD_RESTART "gnome-session-quit --reboot"
16 #define CMD_LOGOUT "gnome-session-quit --logout"
17 #define CMD_SHUTDOWN "gnome-session-quit --power-off"
18 #endif
19@@ -468,8 +466,7 @@
20 && mgr->allow_hibernate;
21 mi_set_visible (mgr->hibernate_mi, v);
22
23- v = HAVE_RESTART_CMD
24- && !g_settings_get_boolean (s, "suppress-restart-menuitem");
25+ v = !g_settings_get_boolean (s, "suppress-restart-menuitem");
26 mi_set_visible (mgr->restart_mi, v);
27
28 v = !g_settings_get_boolean (s, "suppress-shutdown-menuitem");

Subscribers

People subscribed via source and target branches