Merge lp:~pimvullers/snap-elementary/fix-983560 into lp:snap-elementary

[Pim Vullers]

This branch fixes bug #983560

[Cody Garver (codygarver)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-03-25 10:42:47 +0000
+++ CMakeLists.txt	2012-05-18 15:21:17 +0000
@@ -73,4 +73,4 @@
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/ DESTINATION share/icons/)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap.desktop DESTINATION share/applications)
 include(GSettings)
-add_schema("org.elementary.snap.gschema.xml")
+add_schema("org.pantheon.snap.gschema.xml")

=== removed file 'org.elementary.snap.gschema.xml'
--- org.elementary.snap.gschema.xml	2012-02-25 15:31:23 +0000
+++ org.elementary.snap.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<schemalist>
-    <schema path="/apps/snap/settings/" id="org.elementary.Snap.Settings" gettext-domain="snap">
-        <key name="countdown-time" type="i">
-        <default>5</default>
-            <summary>The time for the countdown.</summary>
-            <description>The time for the countdown.</description>
-        </key>
-        <key name="countdown" type="b">
-            <default>true</default>
-            <summary>Use or not the countdown.</summary>
-            <description>Use or not the countdown.</description>
-        </key>
-    </schema>
-</schemalist>

=== added file 'org.pantheon.snap.gschema.xml'
--- org.pantheon.snap.gschema.xml	1970-01-01 00:00:00 +0000
+++ org.pantheon.snap.gschema.xml	2012-05-18 15:21:17 +0000
@@ -0,0 +1,14 @@
+<schemalist>
+    <schema path="/org/pantheon/snap/settings/" id="org.pantheon.snap.settings" gettext-domain="snap">
+        <key name="countdown-time" type="i">
+        <default>5</default>
+            <summary>The time for the countdown.</summary>
+            <description>The time for the countdown.</description>
+        </key>
+        <key name="countdown" type="b">
+            <default>true</default>
+            <summary>Use or not the countdown.</summary>
+            <description>Use or not the countdown.</description>
+        </key>
+    </schema>
+</schemalist>

=== modified file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2012-02-25 15:31:23 +0000
+++ src/Services/Settings.vala	2012-05-18 15:21:17 +0000
@@ -27,7 +27,7 @@
         public int countdown_time { get; set; }
 
         public Settings ()  {
-            base ("org.elementary.Snap.Settings");
+            base ("org.pantheon.snap.settings");
         }
 
     }