[gconf] Use /usr/share/GConf

[Matthias Clasen <matthiasc src gnome org>]

commit 3371eb1c65b3a96b3afa8e85d17c28c9eb4bd7e0
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 20 19:49:51 2010 -0400

    Use /usr/share/GConf
    
    Using a second gconf dir in /usr/share is just bad.

 gsettings/gsettings-data-convert.c   |    2 +-
 gsettings/gsettings-data-convert.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
index 6f79615..a518336 100644
--- a/gsettings/gsettings-data-convert.c
+++ b/gsettings/gsettings-data-convert.c
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
 
-static const gchar convert_dir[] = "/usr/share/gconf/gsettings";
+static const gchar convert_dir[] = "/usr/share/GConf/gsettings";
 
 static gboolean verbose = FALSE;
 static gboolean dry_run = FALSE;
diff --git a/gsettings/gsettings-data-convert.xml b/gsettings/gsettings-data-convert.xml
index 43ee08b..987efd6 100644
--- a/gsettings/gsettings-data-convert.xml
+++ b/gsettings/gsettings-data-convert.xml
@@ -25,7 +25,7 @@ GConf database and stores them in GSettings.
 </para>
 <para>
 The information about the mapping from GConf keys to GSettings keys
-is taken from files in <filename>/usr/share/gconf/gsettings</filename>.
+is taken from files in <filename>/usr/share/GConf/gsettings</filename>.
 Each file in that directory is read as a key file, with sections
 for each GSettings schema that is being converted. The entries in
 each section map GSettings keys to paths in the GConf database.