Merge lp:~darkxst/ubiquity/lp1204312 into lp:ubiquity

[Tim Lunn]

[Tim Lunn (darkxst)]

hardcoding XDG_SESSION_ID allows network indicator and gnome-shell to work. wireless panel works under gnome-shell, but not metacity/nm-applet where it still gets the same permission crash.

[Tim Lunn (darkxst)]

actually wireless panel works on first boot, can connect to wifi when using metacity/nm-applet. However on second boot where wifi is configured (using a persistant USB) ubiquity crashes with the permission denied dbus error.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-08-01 19:56:12 +0000
+++ bin/ubiquity-dm	2013-08-27 06:38:24 +0000
@@ -258,6 +258,7 @@
 
         os.environ['DISPLAY'] = self.display
         os.environ['HOME'] = self.homedir
+        os.environ['XDG_SESSION_ID'] = 'c1'
         # Give ubiquity a UID and GID that it can drop privileges to.
         os.environ['PKEXEC_UID'] = str(self.uid)
         os.environ['GVFS_DISABLE_FUSE'] = '1'
@@ -308,7 +309,8 @@
                     '/usr/share/lubuntu/wallpapers/'
                     'lubuntu-default-wallpaper.png',
                     '/usr/share/backgrounds/ubuntukylin-default-settings.jpg',
-                    '/usr/share/backgrounds/warty-final-ubuntu.png'):
+                    '/usr/share/backgrounds/warty-final-ubuntu.png',
+                    '/usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'):
                 exists = os.access(background, os.R_OK)
                 if exists:
                     background_image = background
@@ -385,7 +387,9 @@
                             preexec_fn=self.drop_privileges))
                         os.environ['GTK_MODULES'] += os.pathsep + 'gail'
 
-            if osextras.find_on_path('metacity'):
+            if osextras.find_on_path('gnome-shell'):
+                wm_cmd = ['gnome-shell', '--sm-disable', '--mode=ubiquity']
+            elif osextras.find_on_path('metacity'):
                 wm_cmd = ['metacity', '--sm-disable']
             elif osextras.find_on_path('xfwm4'):
                 wm_cmd = ['xfwm4', '--compositor=off']
@@ -426,13 +430,15 @@
 
             if (os.path.exists('/usr/lib/ubiquity/panel') and
                     "xfwm4" not in wm_cmd):
-                if "openbox-lubuntu" not in wm_cmd and "openbox" not in wm_cmd:
+                if ("openbox-lubuntu" not in wm_cmd and
+                        "openbox" not in wm_cmd and
+                        "gnome-shell" not in wm_cmd):
                     extras.append(subprocess.Popen(
                         ['/usr/lib/ubiquity/panel'],
                         stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
 
-            if osextras.find_on_path('nm-applet'):
+            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,
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-01 19:03:23 +0000
+++ data/Makefile.am	2013-08-27 06:38:24 +0000
@@ -2,6 +2,9 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
+modedir = $(datadir)/gnome-shell/modes
+mode_DATA = ubiquity.json
+
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = \
@@ -16,6 +19,6 @@
 polkit_policy_in_files = com.ubuntu.ubiquity.policy.in
 polkit_policy_DATA = $(polkit_policy_in_files:.policy.in=.policy)
 
-EXTRA_DIST = $(desktop_in_files) $(polkit_policy_in_files)
+EXTRA_DIST = $(desktop_in_files) $(polkit_policy_in_files) ubiquity.json
 
 CLEANFILES = $(desktop_DATA)
 
=== added file 'data/ubiquity.json'
--- data/ubiquity.json	1970-01-01 00:00:00 +0000
+++ data/ubiquity.json	2013-08-27 06:38:24 +0000
@@ -0,0 +1,9 @@
+{
+    "hasWindows": true,
+    "components": ["polkitAgent", "networkAgent"],
+    "panel": { "left": [],
+               "center": [],
+               "right": ["a11yGreeter", "keyboard", "volume", "network","battery", "powerMenu"]
+    }
+}
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-21 17:54:52 +0000
+++ debian/changelog	2013-08-27 06:38:24 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.15.15) UNRELEASED; urgency=low
+
+  * Add Ubuntu GNOME background to ubiquity-dm (LP: #1204312)
+  * Use gnome-shell as wm in ubiquity-dm on Ubuntu GNOME (LP: #1214732)
+  * export XDG_SESSION_ID to provide access to hijacked logind session
+
+ -- Tim Lunn <[e-mail]>  Tue, 27 Aug 2013 10:24:37 +1000
+
 ubiquity (2.15.14) saucy; urgency=low
 
   * Port autopilot tests to updated API for retrieving application proxy
 
=== modified file 'debian/ubiquity-frontend-gtk.install'
--- debian/ubiquity-frontend-gtk.install	2013-08-01 19:03:23 +0000
+++ debian/ubiquity-frontend-gtk.install	2013-08-27 06:38:24 +0000
@@ -16,3 +16,4 @@
 usr/lib/ubiquity
 usr/share/gir-1.0/*.gir
 usr/share/icons/hicolor/*/apps/ubiquity.svg
+usr/share/gnome-shell