xubuntu-dev team mailing list archive

[Sean Davis <bluesabre@xxxxxxxxxx>]

Sean Davis has proposed merging lp:~xubuntu-dev/ubiquity/lp1437180_feh into lp:ubiquity.

Requested reviews:
  Ubuntu Installer Team (ubuntu-installer)
Related bugs:
  Bug #1437180 in xubuntu-default-settings (Ubuntu): "Desktop Icons show on the install only desktop"
  https://bugs.launchpad.net/ubuntu/+source/xubuntu-default-settings/+bug/1437180

For more details, see:
https://code.launchpad.net/~xubuntu-dev/ubiquity/lp1437180_feh/+merge/262285

This change allows feh to draw the desktop with Xfce components.  This enables a simpler, lower resource desktop option at install time and eliminates the issues with a full-fledged desktop application running (launching apps, displaying icons, etc).
-- 
Your team Xubuntu Developers is subscribed to branch lp:~xubuntu-dev/ubiquity/lp1437180_feh.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2015-03-18 12:08:09 +0000
+++ bin/ubiquity-dm	2015-06-18 01:19:42 +0000
@@ -515,10 +515,6 @@
 
             if osextras.find_on_path('xfsettingsd'):
                 extras.append(subprocess.Popen(
-                    ['xsetroot', '-solid', 'black'],
-                    stdin=null, stdout=logfile, stderr=logfile,
-                    preexec_fn=self.drop_privileges))
-                extras.append(subprocess.Popen(
                     ['xprop', '-root', '-format', '_NET_NUMBER_OF_DESKTOPS',
                      '32c', '-set', '_NET_NUMBER_OF_DESKTOPS', '1'],
                     stdin=null, stdout=logfile, stderr=logfile,
@@ -527,10 +523,6 @@
                     ['xfsettingsd', '--sm-client-disable'],
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
-                extras.append(subprocess.Popen(
-                    ['xfdesktop', '--sm-client-disable'],
-                    stdin=null, stdout=logfile, stderr=logfile,
-                    preexec_fn=self.drop_privileges))
 
             if osextras.find_on_path('lxsession'):
                 extras.append(subprocess.Popen(

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-04 14:36:54 +0000
+++ debian/changelog	2015-06-18 01:19:42 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.21.28) UNRELEASED; urgency=medium
+
+  * bin/ubiquity-dm: Draw the ubiquity desktop with feh under
+    Xfce environments (LP: #1437180)
+
+ -- Sean Davis <smd.seandavis@xxxxxxxxx>  Wed, 17 Jun 2015 00:11:15 -0400
+
 ubiquity (2.21.27) wily; urgency=medium
 
   * Automatic update of included source packages: choose-mirror