[tracker/gsettings-remaining-bits: 4/7] libtracker-data: Rename Store.DB to just DB

[Martyn James Russell <mr src gnome org>]

commit f9f5745aea7d567fed2411f7e0b9538c2c05153e
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Mar 15 11:12:02 2011 +0000

    libtracker-data: Rename Store.DB to just DB
    
    FTS is also part of the store but we don't attach it there either

 data/gschemas/Makefile.am                          |    4 ++--
 ...n => org.freedesktop.Tracker.DB.gschema.xml.in} |    2 +-
 ...ma.xml.in => org.freedesktop.Tracker.DB.xml.in} |    2 +-
 .../org.freedesktop.Tracker.Store.gschema.xml.in   |    1 -
 src/libtracker-data/tracker-db-config.c            |    4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/data/gschemas/Makefile.am b/data/gschemas/Makefile.am
index 6eacdfc..5a55d46 100644
--- a/data/gschemas/Makefile.am
+++ b/data/gschemas/Makefile.am
@@ -4,9 +4,9 @@ gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
 gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
 gsettings_SCHEMAS = \
 	org.freedesktop.Tracker.gschema.xml \
+	org.freedesktop.Tracker.DB.gschema.xml \
 	org.freedesktop.Tracker.FTS.gschema.xml \
 	org.freedesktop.Tracker.Store.gschema.xml \
-	org.freedesktop.Tracker.Store.DB.gschema.xml \
 	org.freedesktop.Tracker.Extractor.gschema.xml \
 	org.freedesktop.Tracker.Writeback.gschema.xml \
 	org.freedesktop.Tracker.Miner.FileSystem.gschema.xml
@@ -19,4 +19,4 @@ CLEANFILES = $(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
 	org.freedesktop.Tracker.enums.xml \
-	$(gsettings_SCHEMAS)
\ No newline at end of file
+	$(gsettings_SCHEMAS)
diff --git a/data/gschemas/org.freedesktop.Tracker.Store.DB.xml.in b/data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
similarity index 91%
rename from data/gschemas/org.freedesktop.Tracker.Store.DB.xml.in
rename to data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
index 5915c5d..dc15e89 100644
--- a/data/gschemas/org.freedesktop.Tracker.Store.DB.xml.in
+++ b/data/gschemas/org.freedesktop.Tracker.DB.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.Store.DB" path="/org/freedesktop/tracker/store/db" gettext-domain="tracker">
+  <schema id="org.freedesktop.Tracker.DB" path="/org/freedesktop/tracker/db/" gettext-domain="tracker">
     <key name="journal-chunk-size" type="i">
       <default>50</default>
       <_summary>Maximum size of journal</_summary>
diff --git a/data/gschemas/org.freedesktop.Tracker.Store.DB.gschema.xml.in b/data/gschemas/org.freedesktop.Tracker.DB.xml.in
similarity index 92%
rename from data/gschemas/org.freedesktop.Tracker.Store.DB.gschema.xml.in
rename to data/gschemas/org.freedesktop.Tracker.DB.xml.in
index 383db15..856563c 100644
--- a/data/gschemas/org.freedesktop.Tracker.Store.DB.gschema.xml.in
+++ b/data/gschemas/org.freedesktop.Tracker.DB.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.Store.DB" path="/org/freedesktop/tracker/store/db/" gettext-domain="tracker">
+  <schema id="org.freedesktop.Tracker.DB" path="/org/freedesktop/tracker/db" gettext-domain="tracker">
     <key name="journal-chunk-size" type="i">
       <default>50</default>
       <_summary>Maximum size of journal</_summary>
diff --git a/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in b/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
index b8ac3ef..bd4ac8d 100644
--- a/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
+++ b/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
@@ -19,7 +19,6 @@ Boston, MA  02110-1301, USA.
 -->
 <schemalist>
   <schema id="org.freedesktop.Tracker.Store" path="/org/freedesktop/tracker/store/" gettext-domain="tracker">
-    <child name="db" schema="org.freedesktop.Tracker.Store.DB"/>
     <key name="verbosity" enum="org.freedesktop.Tracker.TrackerVerbosity">
       <default>'errors'</default>
       <_summary>Log verbosity</_summary>
diff --git a/src/libtracker-data/tracker-db-config.c b/src/libtracker-data/tracker-db-config.c
index 7efdc68..14cefef 100644
--- a/src/libtracker-data/tracker-db-config.c
+++ b/src/libtracker-data/tracker-db-config.c
@@ -172,8 +172,8 @@ TrackerDBConfig *
 tracker_db_config_new (void)
 {
 	return g_object_new (TRACKER_TYPE_DB_CONFIG,
-                             "schema", "org.freedesktop.Tracker.Store.DB",
-	                     "path", "/org/freedesktop/tracker/store/db/",
+                             "schema", "org.freedesktop.Tracker.DB",
+	                     "path", "/org/freedesktop/tracker/db/",
 	                     NULL);
 }