Merge lp:~pimvullers/ergo/fix-983560 into lp:ergo

[Pim Vullers]

Fixed bug #983560

[lp:~pimvullers/ergo/fix-983560]

35. By Pim Vullers on 2012-05-18

Forgot to update the CMakeLists.txt file

Unmerged revisions

35. By Pim Vullers on 2012-05-18

Forgot to update the CMakeLists.txt file

34. By Pim Vullers on 2012-05-18

Fixed bug #983560

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-10-16 21:04:46 +0000
+++ CMakeLists.txt	2012-05-18 15:01:26 +0000
@@ -122,7 +122,7 @@
 #
 # GSettings Schema
 #
-SET (ERGO_SCHEMAS "org.elementary.Ergo.gschema.xml")
+SET (ERGO_SCHEMAS "org.pantheon.ergo.gschema.xml")
 
 # Have an option to not install the schema into where GLib is
 option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)

=== modified file 'Ergo/SavedState.vala'
--- Ergo/SavedState.vala	2011-08-22 21:12:20 +0000
+++ Ergo/SavedState.vala	2012-05-18 15:01:26 +0000
@@ -31,7 +31,7 @@
 		public int window_state { get; set; }
 				
 		public SavedState () {
-			base ("org.elementary.Ergo.SavedState");
+			base ("org.pantheon.ergo.savedstate");
 		}
 	
 	}

=== removed file 'org.elementary.Ergo.gschema.xml'
--- org.elementary.Ergo.gschema.xml	2011-08-22 21:12:20 +0000
+++ org.elementary.Ergo.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<schemalist>
-	<schema path="/apps/ergo/saved-state/" id="org.elementary.Ergo.SavedState" gettext-domain="ergo">
-		<key name="window-width" type="i">
-			<default>850</default>
-			<summary>The saved width of the window.</summary>
-			<description>The saved width of the window. Must be greater than 700, or it will not take effect.</description>
-		</key>
-		<key name="window-height" type="i">
-			<default>550</default>
-			<summary>The saved height of the window.</summary>
-			<description>The saved height of the window. Must be greater than 400, or it will not take effect.</description>
-		</key>
-		<key name="window-state" type="i">
-			<default>0</default>
-			<summary>The saved state of the window.</summary>
-			<description>The saved state of the window.</description>
-		</key>
-	</schema>
-</schemalist>

=== added file 'org.pantheon.ergo.gschema.xml'
--- org.pantheon.ergo.gschema.xml	1970-01-01 00:00:00 +0000
+++ org.pantheon.ergo.gschema.xml	2012-05-18 15:01:26 +0000
@@ -0,0 +1,19 @@
+<schemalist>
+	<schema path="/org/pantheon/ergo/saved-state/" id="org.pantheon.ergo.savedstate" gettext-domain="ergo">
+		<key name="window-width" type="i">
+			<default>850</default>
+			<summary>The saved width of the window.</summary>
+			<description>The saved width of the window. Must be greater than 700, or it will not take effect.</description>
+		</key>
+		<key name="window-height" type="i">
+			<default>550</default>
+			<summary>The saved height of the window.</summary>
+			<description>The saved height of the window. Must be greater than 400, or it will not take effect.</description>
+		</key>
+		<key name="window-state" type="i">
+			<default>0</default>
+			<summary>The saved state of the window.</summary>
+			<description>The saved state of the window.</description>
+		</key>
+	</schema>
+</schemalist>