Merge lp:~fossfreedom/ubiquity/ubuntu-budgie-panel-support into lp:ubiquity

[fossfreedom]

This resolves #1657447 - The Try/Install screen for Ubuntu Budgie without this patch would not display a panel containing the network-manager applet.

Unlike most window-managers - budgie-desktop requires a separate executable to display a panel.

Ubiquity-panel is not a good choice for Ubuntu Budgie - Ubuntu Budgie uses gnome-settings-daemon for theming. It appears ubiquity-panel requires unity-settings-daemon. Testing under 16.04 and 16.10 shows that ubiquity-panel to be poorly themed - I guess there is a clash between the two daemons running for the window manager budgie-wm.

[Mathieu Trudel-Lapierre (cyphermox)]

Approve, I'll merge this with some minor changes.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2017-01-07 10:09:56 +0000
+++ bin/ubiquity-dm	2017-01-18 20:20:44 +0000
@@ -597,6 +597,12 @@
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
 
+            if ("budgie-wm" in wm_cmd):
+                extras.append(subprocess.Popen(
+                    ['budgie-panel', '--replace'],
+                    stdin=null, stdout=logfile, stderr=logfile,
+                    preexec_fn=self.drop_privileges))
+
             if os.path.exists('/usr/lib/ubiquity/panel'):
                 if ("openbox-lubuntu" not in wm_cmd and
                         "openbox" not in wm_cmd and
@@ -627,10 +633,16 @@
 
             if (osextras.find_on_path('nm-applet') and
                     "gnome-shell" not in wm_cmd):
-                extras.append(subprocess.Popen(
-                    ['nm-applet'],
-                    stdin=null, stdout=logfile, stderr=logfile,
-                    preexec_fn=self.drop_privileges))
+                if ("budgie-wm" not in wm_cmd):
+                    extras.append(subprocess.Popen(
+                        ['nm-applet'],
+                        stdin=null, stdout=logfile, stderr=logfile,
+                        preexec_fn=self.drop_privileges))
+                else:
+                    extras.append(subprocess.Popen(
+                        ['nm-applet', '--no-indicator'],
+                        stdin=null, stdout=logfile, stderr=logfile,
+                        preexec_fn=self.drop_privileges))
 
             if osextras.find_on_path('ibus-daemon'):
                 extras.append(subprocess.Popen(

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-07 14:06:13 +0000
+++ debian/changelog	2017-01-18 20:20:44 +0000
@@ -1,3 +1,10 @@
+ubiquity (17.04.3) zesty; urgency=medium
+
+  * Update ubiquity-dm to ensure Ubuntu Budgie displays its panel
+    to allow users to use the network-manager applet (LP: #1657447)
+
+ -- David Mohammed <[e-mail]>  Wed, 18 Jan 2017 19:58:03 +0000
+
 ubiquity (17.04.2) zesty; urgency=medium
 
   [ David Mohammed ]