xubuntu-dev team mailing list archive

[Thaddäus Tintenfisch <thad.fisch@xxxxxxxxx>]

Thaddäus Tintenfisch has proposed merging lp:~thad-fisch/xubuntu-default-settings/restore-xfdesktop-settings into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)
Related bugs:
  Bug #1297170 in xubuntu-default-settings (Ubuntu): "Live Session starts with XFCE wallpaper/install uses same"
  https://bugs.launchpad.net/ubuntu/+source/xubuntu-default-settings/+bug/1297170

For more details, see:
https://code.launchpad.net/~thad-fisch/xubuntu-default-settings/restore-xfdesktop-settings/+merge/213455

Revert commit 464

The commit changed the wallpaper settings layout to reflect the new 4.11 style. However, it did not fix the related bug 1271713. This bug has been fixed in the package xfdesktop4 (4.11.4-1ubuntu1), but the old settings layout is still required to migrate the wallpaper settings properly.

-- 
https://code.launchpad.net/~thad-fisch/xubuntu-default-settings/restore-xfdesktop-settings/+merge/213455
Your team Xubuntu Developers is requested to review the proposed merge of lp:~thad-fisch/xubuntu-default-settings/restore-xfdesktop-settings into lp:xubuntu-default-settings.

=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml	2014-02-27 15:17:10 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml	2014-03-31 13:18:34 +0000
@@ -13,16 +13,12 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="workspace0" type="empty">
-          <property name="image-last" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
-          <property name="image-show" type="bool" value="true"/>
-        </property>
+        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
+        <property name="image-show" type="bool" value="true"/>
       </property>
       <property name="monitor1" type="empty">
-        <property name="workspace0" type="empty">
-          <property name="image-last" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
-          <property name="image-show" type="bool" value="true"/>
-        </property>
+        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
+        <property name="image-show" type="bool" value="true"/>
       </property>
     </property>
   </property>