elementaryart team mailing list archive

[Pim Vullers <launchpad.net@xxxxxxxxxxxxxx>]

Pim Vullers has proposed merging lp:~pimvullers/pantheon-wallpaper/fix-983560 into lp:pantheon-wallpaper.

Requested reviews:
  elementary Pantheon team (elementary-pantheon)
Related bugs:
  Bug #983560 in Pantheon Wallpaper: "Settings in wrong path (/apps/ etc. are deprecated)"
  https://bugs.launchpad.net/pantheon-wallpaper/+bug/983560

For more details, see:
https://code.launchpad.net/~pimvullers/pantheon-wallpaper/fix-983560/+merge/106404

This branch fixes bug #983560
-- 
https://code.launchpad.net/~pimvullers/pantheon-wallpaper/fix-983560/+merge/106404
Your team elementaryart (old) is subscribed to branch lp:pantheon-wallpaper.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-03 15:04:37 +0000
+++ CMakeLists.txt	2012-05-18 15:28:19 +0000
@@ -111,4 +111,4 @@
 # GSettings Schema
 #
 include(GSettings)
-add_schema("desktop.Wallpaper.gschema.xml")
+add_schema("org.pantheon.wallpaper.gschema.xml")

=== modified file 'Wallpaper/WallpaperSettings.vala'
--- Wallpaper/WallpaperSettings.vala	2011-08-11 22:36:07 +0000
+++ Wallpaper/WallpaperSettings.vala	2012-05-18 15:28:19 +0000
@@ -69,7 +69,7 @@
 	public string background_color { get; set; }
 	
 	public WallpaperSettings () {
-		base ("desktop.Wallpaper");
+		base ("org.pantheon.wallpaper");
 	}
 	
 	protected override void verify (string key) {

=== removed file 'desktop.Wallpaper.gschema.xml'
--- desktop.Wallpaper.gschema.xml	2011-12-01 20:12:53 +0000
+++ desktop.Wallpaper.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<schemalist>
-	<enum id="picture-mode-enum">
-		<value nick="Tiled" value="0" />
-		<value nick="Centered" value="1" />
-		<value nick="Scaled" value="2" />
-		<value nick="Stretched" value="3" />
-		<value nick="Zoomed" value="4" />
-	</enum>
-	
-	<schema path="/desktop/wallpaper/" id="desktop.Wallpaper" gettext-domain="pantheon-wallpaper">
-		<key name="picture-mode" enum="picture-mode-enum">
-			<default>"Scaled"</default>
-			<summary>Picture Mode</summary>
-			<description>Determines how the image set as the wallpaper is rendered.</description>
-		</key>
-		<key name="picture-path" type="s">
-			<default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
-			<summary>Picture Path</summary>
-			<description>Path to the file to use as the wallpaper picture.</description>
-		</key>
-		<key name="background-color" type="s">
-			<default>'#333'</default>
-			<summary>Background Color</summary>
-			<description>Color to display behind the picture, if that portion is visible.</description>
-		</key>
-	</schema>
-</schemalist>

=== added file 'org.pantheon.wallpaper.gschema.xml'
--- org.pantheon.wallpaper.gschema.xml	1970-01-01 00:00:00 +0000
+++ org.pantheon.wallpaper.gschema.xml	2012-05-18 15:28:19 +0000
@@ -0,0 +1,27 @@
+<schemalist>
+	<enum id="picture-mode-enum">
+		<value nick="Tiled" value="0" />
+		<value nick="Centered" value="1" />
+		<value nick="Scaled" value="2" />
+		<value nick="Stretched" value="3" />
+		<value nick="Zoomed" value="4" />
+	</enum>
+	
+	<schema path="/org/pantheon/wallpaper/" id="org.pantheon.wallpaper" gettext-domain="pantheon-wallpaper">
+		<key name="picture-mode" enum="picture-mode-enum">
+			<default>"Scaled"</default>
+			<summary>Picture Mode</summary>
+			<description>Determines how the image set as the wallpaper is rendered.</description>
+		</key>
+		<key name="picture-path" type="s">
+			<default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
+			<summary>Picture Path</summary>
+			<description>Path to the file to use as the wallpaper picture.</description>
+		</key>
+		<key name="background-color" type="s">
+			<default>'#333'</default>
+			<summary>Background Color</summary>
+			<description>Color to display behind the picture, if that portion is visible.</description>
+		</key>
+	</schema>
+</schemalist>