Merge lp:~fossfreedom/ubiquity/lp1659280 into lp:ubiquity

[fossfreedom]

This merge proposal fixes #1659280 for Ubuntu Budgie.

The GTK_MODULES change I think stops our window manager from starting up correctly. This is the first change in ubiquity-dm - to set up the session-type for budgie-wm.

A previous comment made by cjwatson recommended that ubiquity-panel is the norm. Thus I have switched to ubiquity-panel. This removes the need for the previous Ubuntu Budgie change to display budgie-panel and the special nm-applet --no-indicator section of code in ubiquity-dm. To ensure the panel icons are correctly themed we ensure ubuntu-mono icon theme is used rather than the default in Ubuntu Budgie which would be "pocillo"

The ubiquity-panel color itself should match the theme used in Ubuntu Budgie. Thus the last change is to test for a png which will be installed separately through the budgie-desktop-environment package.

[lp:~fossfreedom/ubiquity/lp1659280]

6515. By fossfreedom on 2017-02-04

removed unneeded --replace for starting budgie-wm

6516. By fossfreedom on 2017-02-04

merge from parent

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2017-01-23 18:01:31 +0000
+++ bin/ubiquity-dm	2017-02-04 10:06:36 +0000
@@ -501,6 +501,12 @@
                         ('org.gnome.desktop.wm.preferences', 'num-workspaces',
                          '1'))
 
+                if (osextras.find_on_path('budgie-wm')):
+                    gsettings_keys.append(
+                        ('org.gnome.desktop.interface', 'icon-theme',
+                         "'ubuntu-mono-dark'"))
+                    os.environ['XDG_SESSION_TYPE'] = 'x11'
+
                 for gs_schema, gs_key, gs_value in gsettings_keys:
                     subprocess.call(
                         ['gsettings', 'set', gs_schema, gs_key, gs_value],
@@ -516,7 +522,8 @@
                         [msd], stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
 
-                elif osextras.find_on_path(usd):
+                elif (osextras.find_on_path(usd) and
+                        not osextras.find_on_path('budgie-wm')):
                     # Wait until xsettings plugin is activated
                     xsettings = SignalWatcher(self, usd,
                                               "org.gnome.SettingsDaemon",
@@ -603,8 +610,7 @@
             if os.path.exists('/usr/lib/ubiquity/panel'):
                 if ("openbox-lubuntu" not in wm_cmd and
                         "openbox" not in wm_cmd and
-                        "gnome-shell" not in wm_cmd and
-                        "budgie-wm" not in wm_cmd):
+                        "gnome-shell" not in wm_cmd):
                     multiarchdir = os.path.split(
                         sysconfig.get_config_var('multiarchsubdir'))[-1]
                     indicators = list(filter(os.path.isfile, [
@@ -628,24 +634,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 (osextras.find_on_path('nm-applet') and
                     "gnome-shell" not in wm_cmd):
-                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))
+                extras.append(subprocess.Popen(
+                    ['nm-applet'],
+                    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-31 03:45:51 +0000
+++ debian/changelog	2017-02-04 10:06:36 +0000
@@ -1,3 +1,12 @@
+ubiquity (17.04.6) zesty; urgency=medium
+
+  * Update ubiquity-dm to ensure windows decorations and background is
+    displayed for Ubuntu Budgie (LP: #1659280)
+    Switch to the ubiquity-panel with a panel color defined by
+    Ubuntu Budgie
+
+ -- David Mohammed <[e-mail]>  Sat, 04 Feb 2017 10:02:26 +0000
+
 ubiquity (17.04.5) zesty; urgency=medium
 
   * Automatic update of included source packages: clock-setup

=== modified file 'src/panel/panel.c'
--- src/panel/panel.c	2017-01-23 16:36:29 +0000
+++ src/panel/panel.c	2017-02-04 10:06:36 +0000
@@ -290,6 +290,9 @@
 		pixbuf = gdk_pixbuf_new_from_file("/usr/share/themes/Greybird/ubiquity-panel-bg.png", NULL);
 	}
 	if (!pixbuf) {
+		pixbuf = gdk_pixbuf_new_from_file("/usr/share/budgie-desktop/ubiquity-panel-bg.png", NULL);
+	}
+	if (!pixbuf) {
 		pixbuf = gdk_pixbuf_new_from_file("/usr/share/ubiquity/pixmaps/panel.png", NULL);
 	}
 	if (pixbuf) {