Merge lp:~seb128/software-properties/dont-use-deprecated-reboot-commands into lp:software-properties

[Sebastien Bacher]

Don't use a deprecated binary to reboot

Don't use a deprecated binary to reboot

[Michael Vogt (mvo)]

On Thu, Oct 17, 2013 at 09:13:32PM -0000, Sebastien Bacher wrote:
> Sebastien Bacher has proposed merging lp:~seb128/software-properties/dont-use-deprecated-reboot-commands into lp:software-properties.
>
> Commit message:
> Don't use a deprecated binary to reboot
>
> Requested reviews:
> Ubuntu Core Development Team (ubuntu-core-dev)
> Related bugs:
> Bug #1241210 in software-properties (Ubuntu): "shouldn't use deprecated gtk-logout-helper"
> https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/1241210
>
> For more details, see:
> https://code.launchpad.net/~seb128/software-properties/dont-use-deprecated-reboot-commands/+merge/191720
>
> Don't use a deprecated binary to reboot

Looks good, +1

Cheers,
 Michael

[Sebastien Bacher (seb128)]

repushed with a changelog entry and merging to trunk, thanks for the review!

[lp:~seb128/software-properties/dont-use-deprecated-reboot-commands]

884. By Sebastien Bacher on 2013-10-21

softwareproperties/gtk/SoftwarePropertiesGtk.py: don't use the
gtk-logout-helper command, it has been deprecated and dropped from the
indicator-session binary, use gnome-session instead (lp: #1241210)

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-16 19:54:01 +0000
+++ debian/changelog	2013-10-21 15:14:24 +0000
@@ -12,6 +12,11 @@
   * debian/manpages/add-apt-repository.1: Documented options -m and -s of
     add-apt-repository (LP: #1229092)
 
+  [ Sebastien Bacher ]
+  * softwareproperties/gtk/SoftwarePropertiesGtk.py: don't use the 
+    gtk-logout-helper command, it has been deprecated and dropped from the
+    indicator-session binary, use gnome-session instead (lp: #1241210)
+
  -- Michael Vogt <[e-mail]>  Wed, 16 Oct 2013 16:13:19 +0200
 
 software-properties (0.92.27) saucy; urgency=low

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2013-10-10 21:59:05 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2013-10-21 15:14:24 +0000
@@ -1089,7 +1089,7 @@
         self.clear_changes()
 
     def on_driver_restart_clicked(self, button_restart):
-        subprocess.call(['/usr/lib/indicator-session/gtk-logout-helper', '--restart'])
+        subprocess.call(['gnome-session-quit', '--reboot'])
 
     def clear_changes(self):
         self.orig_selection = {}