Merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/restore-xfdesktop-settings into lp:~xubuntu-dev/xubuntu-default-settings/trunk

Proposed by Thaddaeus Tintenfisch
Status: Merged
Merged at revision: 472
Proposed branch: lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/restore-xfdesktop-settings
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 26 lines (+6/-8)
1 file modified
etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (+6/-8)
To merge this branch: bzr merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/restore-xfdesktop-settings
Reviewer Review Type Date Requested Status
Pasi Lallinaho (community) community Approve
Simon Steinbeiß Approve
Xubuntu Developers Pending
Review via email: mp+213455@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
470. By Thaddaeus Tintenfisch

Use image style ZOOM to resize the background

Revision history for this message
Simon Steinbeiß (ochosi) wrote :

This makes sense and fixes the wallpaper bug, we should merge it.

review: Approve
Revision history for this message
Pasi Lallinaho (knome) wrote :

Approving with my Xubuntu Project lead hat on.

review: Approve (community)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml'
2--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml 2014-02-27 15:17:10 +0000
3+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml 2014-04-03 21:10:44 +0000
4@@ -13,16 +13,14 @@
5 <property name="backdrop" type="empty">
6 <property name="screen0" type="empty">
7 <property name="monitor0" type="empty">
8- <property name="workspace0" type="empty">
9- <property name="image-last" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
10- <property name="image-show" type="bool" value="true"/>
11- </property>
12+ <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
13+ <property name="image-style" type="int" value="5"/>
14+ <property name="image-show" type="bool" value="true"/>
15 </property>
16 <property name="monitor1" type="empty">
17- <property name="workspace0" type="empty">
18- <property name="image-last" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
19- <property name="image-show" type="bool" value="true"/>
20- </property>
21+ <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/xubuntu-wallpaper.png"/>
22+ <property name="image-style" type="int" value="5"/>
23+ <property name="image-show" type="bool" value="true"/>
24 </property>
25 </property>
26 </property>

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: