Merge lp:~pimvullers/noise/fix-983560 into lp:~elementary-apps/noise/trunk

[Pim Vullers]

This branch fixes bug #983560 by renamed org.elementary to org.pantheon, which has been decided to be the proper naming scheme.

[Victor Martinez (victored)]

Thank you for the fix.

review: Approve

=== modified file 'core/Settings.vala'
--- core/Settings.vala	2012-05-08 02:34:58 +0000
+++ core/Settings.vala	2012-05-18 20:33:17 +0000
@@ -86,11 +86,11 @@
 	HashMap<string, bool> bool_cache;
 
 	public Settings() {
-		lastfm = new GLib.Settings("org.elementary.noise.lastfm");
-		ui = new GLib.Settings("org.elementary.noise.ui");
-		library = new GLib.Settings("org.elementary.noise.library");
-		equalizer = new GLib.Settings("org.elementary.noise.equalizer");
-		plugins = new GLib.Settings("org.elementary.noise.plugins");
+		lastfm = new GLib.Settings("org.pantheon.noise.lastfm");
+		ui = new GLib.Settings("org.pantheon.noise.ui");
+		library = new GLib.Settings("org.pantheon.noise.library");
+		equalizer = new GLib.Settings("org.pantheon.noise.equalizer");
+		plugins = new GLib.Settings("org.pantheon.noise.plugins");
 
 		int_cache = new HashMap<string, int> ();
 		enum_cache = new HashMap<string, int> ();

=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2012-04-06 19:09:26 +0000
+++ schemas/CMakeLists.txt	2012-05-18 20:33:17 +0000
@@ -1,2 +1,2 @@
 include(GSettings)
-add_schema("org.elementary.noise.gschema.xml")
+add_schema("org.pantheon.noise.gschema.xml")

=== renamed file 'schemas/org.elementary.noise.gschema.xml' => 'schemas/org.pantheon.noise.gschema.xml'
--- schemas/org.elementary.noise.gschema.xml	2012-04-20 21:10:12 +0000
+++ schemas/org.pantheon.noise.gschema.xml	2012-05-18 20:33:17 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/org/elementary/noise/lastfm/" id="org.elementary.noise.lastfm">
+  <schema path="/org/pantheon/noise/lastfm/" id="org.pantheon.noise.lastfm">
     <key type="s" name="session-key">
       <default>''</default>
       <summary>Unique session key</summary>
@@ -8,7 +8,7 @@
     </key>
   </schema>
 
-  <schema path="/org/elementary/noise/library/" id="org.elementary.noise.library">
+  <schema path="/org/pantheon/noise/library/" id="org.pantheon.noise.library">
     <key type="s" name="music-folder">
       <default>''</default>
       <summary>Path to music folder</summary>
@@ -77,7 +77,7 @@
     <value nick="Left" value="2" />
   </enum>
   
-  <schema path="/org/elementary/noise/ui/" id="org.elementary.noise.ui">
+  <schema path="/org/pantheon/noise/ui/" id="org.pantheon.noise.ui">
     <key type="i" name="window-width">
       <default>1100</default>
       <summary>Window width</summary>
@@ -145,7 +145,7 @@
     </key>
   </schema>
   
-  <schema path="/org/elementary/noise/equalizer/" id="org.elementary.noise.equalizer">
+  <schema path="/org/pantheon/noise/equalizer/" id="org.pantheon.noise.equalizer">
     <key type="b" name="equalizer-enabled">
       <default>false</default>
       <summary>Whether or not the equalizer is enabled</summary>
@@ -179,7 +179,7 @@
     </key>
   </schema>
 
-  <schema path="/org/elementary/noise/plugins/" id="org.elementary.noise.plugins">
+  <schema path="/org/pantheon/noise/plugins/" id="org.pantheon.noise.plugins">
     <key type="as" name="enabled-plugins">
       <default>[]</default>
       <summary>List of enabled plugins</summary>