Merge lp:~brian-murray/software-properties/more-restart into lp:software-properties

[Brian Murray]

It's testable via 'sudo touch /var/run/reboot-required' and '/usr/share/ubuntu-drivers-common/fake-devices-wrapper software-properties-gtk --open-tab 4'. With the changes installed you should see the "Restart" button and clicking it should raise a dialog about restarting.

[Sean Davis (bluesabre)]

This should resolve the issue for Xubuntu.

review: Approve (xubuntu)

[Simon Quigley (tsimonq2)]

I disagree with the changes being made here because one or more of these packages could be installed at the same time; each desktop environment should use the reboot tool that corresponds to the one they're currently on ($XDG_CURRENT_DESKTOP).

While you're at it, if you're adding support for Lubuntu, please add support for LXQt too, which can be called via `lxqt-leave --reboot`.

Thanks!

[Simon Quigley (tsimonq2)]

Er, let me mark the status too... ;)

review: Needs Fixing

[lp:~brian-murray/software-properties/more-restart]

1010. By Brian Murray on 2018-03-05

Use XDG_CURRENT_DESKTOP environment variable to determine which command to call.

1011. By Brian Murray on 2018-03-06

Add in support for LXQt desktop

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-02 02:35:22 +0000
+++ debian/changelog	2018-03-06 15:47:45 +0000
@@ -1,3 +1,11 @@
+software-properties (0.96.24.23) bionic; urgency=medium
+
+  * SoftwarePropertiesGtk.py: After installing proprietary drivers provide the
+    capability to restart on Lubuntu and Xubuntu. Add recommends on the
+    packages which provide the restart tools. (LP: #1693038)
+
+ -- Brian Murray <[e-mail]>  Fri, 02 Mar 2018 10:43:18 -0800
+
 software-properties (0.96.24.22) bionic; urgency=medium
 
   * software-properties-gtk: Depend on libgtk3-perl for debconf's GNOME

=== modified file 'debian/control'
--- debian/control	2018-03-02 02:34:49 +0000
+++ debian/control	2018-03-06 15:47:45 +0000
@@ -63,8 +63,8 @@
  software-properties-common,
  ubuntu-drivers-common (>= 1:0.2.75),
  python3-gi,
- gnome-session-bin,
  libgtk3-perl
+Recommends: gnome-session-bin | xfce4-session | lubuntu-default-settings | lxqt-session
 Description: manage the repositories that you install software from (gtk)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2017-04-10 21:33:20 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2018-03-06 15:47:45 +0000
@@ -1113,7 +1113,24 @@
         self.clear_changes()
 
     def on_driver_restart_clicked(self, button_restart):
-        subprocess.call(['gnome-session-quit', '--reboot'])
+        if 'XDG_CURRENT_DESKTOP' in os.environ:
+            desktop = os.environ['XDG_CURRENT_DESKTOP']
+        else:
+            desktop = 'Unknown'
+
+        if (desktop == 'ubuntu:GNOME' and
+                os.path.exists('/usr/bin/gnome-session-quit')):
+            # argument presents a dialog to cancel reboot
+            subprocess.call(['gnome-session-quit', '--reboot'])
+        elif (desktop == 'XFCE' and
+              os.path.exists('/usr/bin/xfce4-session-logout')):
+            subprocess.call(['xfce4-session-logout'])
+        elif (desktop == 'LXDE' and
+              os.path.exists('/usr/bin/lubuntu-logout')):
+            subprocess.call(['lubuntu-logout'])
+        elif (desktop == 'LXQt' and
+              os.path.exists('/usr/bin/lxqt-leave')):
+            subprocess.call(['lxqt-leave'])
 
     def clear_changes(self):
         self.orig_selection = {}