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

[Tim Lunn]

[lp:~darkxst/ubiquity/update_bg]

5991. By Tim Lunn on 2013-09-10

* disable g-s-d background plugin for Ubuntu GNOME
* set gsettings keys before launch g-s-d, helps with clunky transitions

5992. By Tim Lunn on 2013-09-10

Don't set num-workspaces as this carries through the live session

5993. By Tim Lunn on 2013-09-10

fix version in changelog

5994. By Tim Lunn on 2013-09-10

clean up formatting a little

[Tim Lunn (darkxst)]

This adds some final tweaks for the ubiquity-dm settings under Ubuntu GNOME.

- Update background image to the new default image.
- Don't load the g-s-d background plugin, this was making a mess of the transitions between plymouth -> ubiquity-dm -> Live session. Gnome-shell does not use this plugin, but its still getting loaded since XDG_CURRENT_DESKTOP is not set here.
- don't set num-workspaces, we run a restrictive gnome-shell in ubiquity-dm so this setting does nothing here, all it does is carries over to the live session and disables workspaces in there.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-08-29 00:23:26 +0000
+++ bin/ubiquity-dm	2013-09-10 23:46:43 +0000
@@ -310,7 +310,7 @@
                     'lubuntu-default-wallpaper.png',
                     '/usr/share/backgrounds/ubuntukylin-default-settings.jpg',
                     '/usr/share/backgrounds/warty-final-ubuntu.png',
-                    '/usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml'):
+                    '/usr/share/backgrounds/gnome/FootFall.png'):
                 exists = os.access(background, os.R_OK)
                 if exists:
                     background_image = background
@@ -356,6 +356,20 @@
                      '1'),
                 ]
 
+                if osextras.find_on_path('gnome-shell'):
+                    gsettings_keys.append(
+                        ('org.gnome.settings-daemon.plugins.background',
+                         'active', 'false'))
+                    gsettings_keys.remove(
+                        ('org.gnome.desktop.wm.preferences', 'num-workspaces',
+                         '1'))
+
+                for gs_schema, gs_key, gs_value in gsettings_keys:
+                    subprocess.call(
+                        ['gsettings', 'set', gs_schema, gs_key, gs_value],
+                        stdin=null, stdout=logfile, stderr=logfile,
+                        preexec_fn=self.drop_privileges)
+
                 gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
                 if osextras.find_on_path(gsd):
                     extras.append(subprocess.Popen(
@@ -368,12 +382,6 @@
                         stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges)
 
-                for gs_schema, gs_key, gs_value in gsettings_keys:
-                    subprocess.call(
-                        ['gsettings', 'set', gs_schema, gs_key, gs_value],
-                        stdin=null, stdout=logfile, stderr=logfile,
-                        preexec_fn=self.drop_privileges)
-
             # Accessibility infrastructure
             with open('/proc/cmdline', 'r') as fp:
                 if (accessibility or 'maybe-ubiquity' in fp.readline() or
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-03 18:54:41 +0000
+++ debian/changelog	2013-09-10 23:46:43 +0000
@@ -4,7 +4,13 @@
   * Split ubuntuone page into a separate package and seed/unseed it as
     appropriate. (LP: #1218175)
 
- -- Dmitrijs Ledkovs <[e-mail]>  Tue, 03 Sep 2013 19:29:14 +0100
+  [ Tim Lunn ]
+  * Update default Ubuntu GNOME Background 
+  * disable g-s-d background plugin for Ubuntu GNOME
+  * set gsettings keys before launch g-s-d, helps with clunky transitions
+  * Don't set num-workspaces as this carries through the live session
+
+ -- Tim Lunn <[e-mail]>  Wed, 11 Sep 2013 09:34:43 +1000
 
 ubiquity (2.15.16) saucy; urgency=low