[tracker/gsettings-remaining-bits] tracker-miner-fs: Renamed schemas "FileSystem" to "Files" for consistency

[Martyn James Russell <mr src gnome org>]

commit e7cdbaf6a51d878f2479df75497a9e7d49ad45aa
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Mar 16 11:24:33 2011 +0000

    tracker-miner-fs: Renamed schemas "FileSystem" to "Files" for consistency
    
    Also renamed "fs" to "files".
    Also renamed "miners" to "miner".

 data/gschemas/Makefile.am                          |    2 +-
 ...freedesktop.Tracker.Miner.Files.gschema.xml.in} |    2 +-
 .../org.freedesktop.Tracker.gschema.xml.in         |    4 ++--
 po/POTFILES.in                                     |    2 +-
 src/miners/fs/tracker-config.c                     |    4 ++--
 src/tracker-preferences/tracker-preferences.vala   |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/gschemas/Makefile.am b/data/gschemas/Makefile.am
index 3378cc7..bde1416 100644
--- a/data/gschemas/Makefile.am
+++ b/data/gschemas/Makefile.am
@@ -9,7 +9,7 @@ gsettings_SCHEMAS = \
 	org.freedesktop.Tracker.Store.gschema.xml \
 	org.freedesktop.Tracker.Extract.gschema.xml \
 	org.freedesktop.Tracker.Writeback.gschema.xml \
-	org.freedesktop.Tracker.Miner.FileSystem.gschema.xml
+	org.freedesktop.Tracker.Miner.Files.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/gschemas/org.freedesktop.Tracker.Miner.FileSystem.gschema.xml.in b/data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
similarity index 97%
rename from data/gschemas/org.freedesktop.Tracker.Miner.FileSystem.gschema.xml.in
rename to data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
index 01ba2b1..d8bcde2 100644
--- a/data/gschemas/org.freedesktop.Tracker.Miner.FileSystem.gschema.xml.in
+++ b/data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
@@ -18,7 +18,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 -->
 <schemalist>
-  <schema id="org.freedesktop.Tracker.Miner.FileSystem" path="/org/freedesktop/tracker/miners/fs/" gettext-domain="tracker">
+  <schema id="org.freedesktop.Tracker.Miner.Files" path="/org/freedesktop/tracker/miner/files/" gettext-domain="tracker">
     <key name="verbosity" enum="org.freedesktop.Tracker.TrackerVerbosity">
       <default>'errors'</default>
       <_summary>Log verbosity</_summary>
diff --git a/data/gschemas/org.freedesktop.Tracker.gschema.xml.in b/data/gschemas/org.freedesktop.Tracker.gschema.xml.in
index 826d1f7..b9ddc1d 100644
--- a/data/gschemas/org.freedesktop.Tracker.gschema.xml.in
+++ b/data/gschemas/org.freedesktop.Tracker.gschema.xml.in
@@ -24,8 +24,8 @@ Boston, MA  02110-1301, USA.
     <child name="store" schema="org.freedesktop.Tracker.Store"/>
     <child name="extract" schema="org.freedesktop.Tracker.Extract"/>
     <child name="writeback" schema="org.freedesktop.Tracker.Writeback"/>
-    <child name="miners" schema="org.freedesktop.Tracker.Miners"/>
+    <child name="miner" schema="org.freedesktop.Tracker.Miner"/>
   </schema>
 
-  <schema id="org.freedesktop.Tracker.Miners" path="/org/freedesktop/tracker/miners/" />
+  <schema id="org.freedesktop.Tracker.Miner" path="/org/freedesktop/tracker/miner/" />
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 977aa7e..275c19a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,7 @@ data/miners/tracker-miner-rss.desktop.in.in
 data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
 data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in
 data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.Miner.FileSystem.gschema.xml.in
+data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
 data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
 data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in
 data/tracker-miner-flickr.desktop.in.in
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 29d25e2..76d8ea6 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -694,8 +694,8 @@ TrackerConfig *
 tracker_config_new (void)
 {
 	return g_object_new (TRACKER_TYPE_CONFIG,
-	                     "schema", "org.freedesktop.Tracker.Miner.FileSystem",
-	                     "path", "/org/freedesktop/tracker/miners/fs/",
+	                     "schema", "org.freedesktop.Tracker.Miner.Files",
+	                     "path", "/org/freedesktop/tracker/miner/files/",
 	                     NULL);
 }
 
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index 864923f..f4b6007 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -61,7 +61,7 @@ public class Tracker.Preferences {
 		debug ("Getting current settings");
 
 		//config = new Config ();
-		settings = new GLib.Settings ("org.freedesktop.Tracker.Miner.FileSystem");
+		settings = new GLib.Settings ("org.freedesktop.Tracker.Miner.Files");
 
 		// Change notification for any key in the schema
 		settings.changed.connect ((key) => {