[libgnomekbd] Fix a crash where the GSettings key was provided as a path

[Sergey V. Udaltsov <svu src gnome org>]

commit df25f12b1075f19deb0782235da8d20bbb2d7360
Author: Richard Hughes <richard hughsie com>
Date:   Fri Nov 19 17:15:12 2010 +0000

    Fix a crash where the GSettings key was provided as a path

 libgnomekbd/gkbd-config-private.h           |    2 +-
 libgnomekbd/gkbd-indicator-plugin-manager.c |    2 +-
 libgnomekbd/gkbd-util.c                     |   19 ++++++-------------
 3 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/libgnomekbd/gkbd-config-private.h b/libgnomekbd/gkbd-config-private.h
index 92eb623..18b1e90 100644
--- a/libgnomekbd/gkbd-config-private.h
+++ b/libgnomekbd/gkbd-config-private.h
@@ -25,7 +25,7 @@
 
 #define GKBD_CONFIG_KEY_PREFIX "/desktop/gnome/peripherals/keyboard"
 
-#define GKBD_SCHEMA "org.gnome.libgnomekbd"
+#define GKBD_SCHEMA_PREVIEW "org.gnome.libgnomekbd.preview"
 
 extern const gchar GKBD_PREVIEW_CONFIG_DIR[];
 extern const gchar GKBD_PREVIEW_CONFIG_KEY_X[];
diff --git a/libgnomekbd/gkbd-indicator-plugin-manager.c b/libgnomekbd/gkbd-indicator-plugin-manager.c
index 70a5d6d..9c55d66 100644
--- a/libgnomekbd/gkbd-indicator-plugin-manager.c
+++ b/libgnomekbd/gkbd-indicator-plugin-manager.c
@@ -395,7 +395,7 @@ void
 void
 gkbd_indicator_plugin_container_init (GkbdIndicatorPluginContainer * pc)
 {
-	pc->settings = g_settings_new (GKBD_SCHEMA);
+	pc->settings = g_settings_new ("org.gnome.libgnomekbd.indicator");
 }
 
 void
diff --git a/libgnomekbd/gkbd-util.c b/libgnomekbd/gkbd-util.c
index af5002b..25867b3 100644
--- a/libgnomekbd/gkbd-util.c
+++ b/libgnomekbd/gkbd-util.c
@@ -45,24 +45,17 @@ gkbd_install_glib_log_appender (void)
 	xkl_set_log_appender (gkbd_log_appender);
 }
 
-#define GKBD_PREVIEW_CONFIG_KEY_PREFIX  GKBD_CONFIG_KEY_PREFIX "/preview"
-
-const gchar GKBD_PREVIEW_CONFIG_DIR[] = GKBD_PREVIEW_CONFIG_KEY_PREFIX;
-const gchar GKBD_PREVIEW_CONFIG_KEY_X[] =
-    GKBD_PREVIEW_CONFIG_KEY_PREFIX "/x";
-const gchar GKBD_PREVIEW_CONFIG_KEY_Y[] =
-    GKBD_PREVIEW_CONFIG_KEY_PREFIX "/y";
-const gchar GKBD_PREVIEW_CONFIG_KEY_WIDTH[] =
-    GKBD_PREVIEW_CONFIG_KEY_PREFIX "/width";
-const gchar GKBD_PREVIEW_CONFIG_KEY_HEIGHT[] =
-    GKBD_PREVIEW_CONFIG_KEY_PREFIX "/height";
+const gchar GKBD_PREVIEW_CONFIG_KEY_X[] = "x";
+const gchar GKBD_PREVIEW_CONFIG_KEY_Y[] = "y";
+const gchar GKBD_PREVIEW_CONFIG_KEY_WIDTH[] = "width";
+const gchar GKBD_PREVIEW_CONFIG_KEY_HEIGHT[] = "height";
 
 GdkRectangle *
 gkbd_preview_load_position (void)
 {
 	GdkRectangle *rv = NULL;
 	gint x, y, w, h;
-	GSettings *settings = g_settings_new (GKBD_SCHEMA);
+	GSettings *settings = g_settings_new (GKBD_SCHEMA_PREVIEW);
 
 	if (settings == NULL)
 		return NULL;
@@ -100,7 +93,7 @@ gkbd_preview_load_position (void)
 void
 gkbd_preview_save_position (GdkRectangle * rect)
 {
-	GSettings *settings = g_settings_new (GKBD_SCHEMA);
+	GSettings *settings = g_settings_new (GKBD_SCHEMA_PREVIEW);
 
 	g_settings_delay (settings);