[gucharmap] Rename schema

[Christian Persch <chpe src gnome org>]

commit 741f4eb53cfc4641b7e4b892d843b850a8b36bca
Author: Christian Persch <chpe gnome org>
Date:   Mon Feb 6 19:58:29 2012 +0100

    Rename schema

 Makefile.am                                        |    2 --
 gucharmap/Makefile.am                              |    4 ++--
 gucharmap/gucharmap-settings.c                     |    2 +-
 gucharmap/gucharmap-window.c                       |    2 +-
 ...p.gschema.xml => org.gnome.Charmap.gschema.xml} |    6 +++---
 5 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d38c8e4..745e152 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ EXTRA_DIST = \
 	autogen.sh \
 	gtkrc.win32 \
 	gnome-doc-utils.make \
-	org.gnome.gucharmap.schema.xml.in \
 	COPYING.UNICODE \
 	$(NULL)
 
@@ -42,7 +41,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 CLEANFILES = \
 	$(desktop_DATA) \
-	$(gsettings_schema) \
 	$(NULL)
 
 MAINTAINERCLEANFILES = \
diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am
index 0acffcf..e3fc856 100644
--- a/gucharmap/Makefile.am
+++ b/gucharmap/Makefile.am
@@ -262,9 +262,9 @@ endif # !OS_WIN32
 
 endif # ENABLE_CHARMAP
 
-gsettings_ENUM_NAMESPACE = org.gnome.gucharmap
+gsettings_ENUM_NAMESPACE = org.gnome.Charmap
 gsettings_ENUM_FILES = gucharmap-settings.h
-gsettings_SCHEMAS = org.gnome.gucharmap.gschema.xml
+gsettings_SCHEMAS = org.gnome.Charmap.gschema.xml
 
 @GSETTINGS_RULES@
 
diff --git a/gucharmap/gucharmap-settings.c b/gucharmap/gucharmap-settings.c
index 2fef9cd..565fc84 100644
--- a/gucharmap/gucharmap-settings.c
+++ b/gucharmap/gucharmap-settings.c
@@ -118,7 +118,7 @@ gucharmap_settings_add_window (GtkWindow *window)
   g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (window)));
 
   state = g_slice_new0 (WindowState);
-  state->settings = g_settings_new ("org.gnome.gucharmap.WindowState");
+  state->settings = g_settings_new ("org.gnome.Charmap.WindowState");
   g_object_set_data_full (G_OBJECT (window), "GamesConf::WindowState",
                           state, (GDestroyNotify) free_window_state);
 
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index d5d79a8..88cf729 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -834,7 +834,7 @@ gucharmap_window_init (GucharmapWindow *guw)
   gunichar active;
   gchar *font;
 
-  guw->settings = g_settings_new ("org.gnome.gucharmap");
+  guw->settings = g_settings_new ("org.gnome.Charmap");
 
   gtk_window_set_title (GTK_WINDOW (guw), _("Character Map"));
   gtk_window_set_icon_name (GTK_WINDOW (guw), GUCHARMAP_ICON_NAME);
diff --git a/gucharmap/org.gnome.gucharmap.gschema.xml b/gucharmap/org.gnome.Charmap.gschema.xml
similarity index 92%
rename from gucharmap/org.gnome.gucharmap.gschema.xml
rename to gucharmap/org.gnome.Charmap.gschema.xml
index f85e2b3..69fb9d6 100644
--- a/gucharmap/org.gnome.gucharmap.gschema.xml
+++ b/gucharmap/org.gnome.Charmap.gschema.xml
@@ -22,8 +22,8 @@
 -->
 
 <schemalist gettext-domain='gucharmap'>
-  <schema id='org.gnome.gucharmap' path='/org/gnome/gucharmap/'>
-    <key name='group-by' enum='org.gnome.gucharmap.GucharmapChaptersMode'>
+  <schema id='org.gnome.Charmap' path='/org/gnome/charmap/'>
+    <key name='group-by' enum='org.gnome.Charmap.GucharmapChaptersMode'>
       <summary>Character map grouping method</summary>
       <description>
         This is how the characters in the character map are grouped.
@@ -66,7 +66,7 @@
     </key>
   </schema>
 
-  <schema id='org.gnome.gucharmap.WindowState' path='/org/gnome/gucharmap/window-state/'>
+  <schema id='org.gnome.Charmap.WindowState' path='/org/gnome/charmap/window-state/'>
     <key name='maximized' type='b'>
       <default>false</default>
     </key>