Merge lp:~mitya57/software-properties/lp1047424 into lp:software-properties

Proposed by Dmitry Shachnev
Status: Merged
Approved by: Michael Vogt
Approved revision: 843
Merged at revision: 843
Proposed branch: lp:~mitya57/software-properties/lp1047424
Merge into: lp:software-properties
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+1/-1)
To merge this branch: bzr merge lp:~mitya57/software-properties/lp1047424
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+161625@code.launchpad.net

Description of the change

This is a one-line fix for bug 1047424, and makes Restart button really restart the system.

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 'debian/changelog'
2--- debian/changelog 2013-03-22 10:38:14 +0000
3+++ debian/changelog 2013-04-30 15:26:27 +0000
4@@ -1,3 +1,9 @@
5+software-properties (0.92.18) UNRELEASED; urgency=low
6+
7+ * Make Restart button restart the system, not shutdown it (LP: #1047424).
8+
9+ -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 30 Apr 2013 19:05:09 +0400
10+
11 software-properties (0.92.17) raring; urgency=low
12
13 * data/software-properties-gnome.desktop.in:
14
15=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
16--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2013-02-21 03:59:28 +0000
17+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2013-04-30 15:26:27 +0000
18@@ -1077,7 +1077,7 @@
19 self.clear_changes()
20
21 def on_driver_restart_clicked(self, button_restart):
22- subprocess.call(['/usr/lib/indicator-session/gtk-logout-helper', '--shutdown'])
23+ subprocess.call(['/usr/lib/indicator-session/gtk-logout-helper', '--restart'])
24
25 def clear_changes(self):
26 self.orig_selection = {}

Subscribers

People subscribed via source and target branches

to status/vote changes: