Merge lp:~ubuntubudgie-dev/ubiquity/fix_lp_1713662 into lp:ubiquity

[fossfreedom]

This is a proposed change to fix LP: #1713662

We previously explicitly set the environment variable x11 to display ubiquity. However, this environment variable is now set just above this bit of code.

Hence I've taken the opportunity to setting XDG_CURRENT_DESKTOP at the some point - Ubuntu Budgie's budgie-wm (budgie window manager)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2017-08-21 09:03:14 +0000
+++ bin/ubiquity-dm	2017-08-30 12:48:00 +0000
@@ -506,7 +506,7 @@
                     gsettings_keys.append(
                         ('org.gnome.desktop.interface', 'icon-theme',
                          "'ubuntu-mono-dark'"))
-                    os.environ['XDG_SESSION_TYPE'] = 'x11'
+                    os.environ['XDG_CURRENT_DESKTOP'] = 'Budgie'
 
                 for gs_schema, gs_key, gs_value in gsettings_keys:
                     subprocess.call(