Merge lp:~maclin.jun/ubiquity/ubiquity into lp:ubiquity

[Ma Jun]

change the ubuntukylin backgroud wallpaper name in ubiquity-dm from "ubuntukylin-default-settings.jpg" to "warty-final-ubuntukylin.jpg". This change is done according to name rules of ubuntu.

[Colin Watson (cjwatson)]

As discussed on IRC, I think this is a mistake; "warty-final-ubuntu.png" is a historical mistake in Ubuntu that there should be no reason to imitate in other flavours. "ubuntukylin-default-settings.png" is actually a better name. If it's feasible for you to revert the other changes associated with this rather than changing ubiquity, I think that would be better.

review: Disapprove

[Dimitri John Ledkov (xnox)]

Trusty now simply looks up wallpaper from gsettings, no need to hard-code names when one is using gnome-settings-daemon.

Unmerged revisions

6007. By Ma Jun on 2013-09-26

change backgroud wallpaper name according to name rules in ubiquity-dm

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-09-25 12:18:25 +0000
+++ bin/ubiquity-dm	2013-10-06 09:57:53 +0000
@@ -351,7 +351,7 @@
                     '/usr/share/xfce4/backdrops/xubuntu-wallpaper.png',
                     '/usr/share/lubuntu/wallpapers/'
                     'lubuntu-default-wallpaper.png',
-                    '/usr/share/backgrounds/ubuntukylin-default-settings.jpg',
+                    '/usr/share/backgrounds/warty-final-ubuntukylin.jpg',
                     '/usr/share/backgrounds/warty-final-ubuntu.png',
                     '/usr/share/backgrounds/gnome/FootFall.png'):
                 exists = os.access(background, os.R_OK)