diff options
| author | Richard Hughes <richard@hughsie.com> | 2010-11-19 17:15:12 +0000 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2010-11-19 21:11:32 +0000 |
| commit | df25f12b1075f19deb0782235da8d20bbb2d7360 (patch) | |
| tree | a99175e5c6293066ab09eda79b527f27edaf5fcd /libgnomekbd/gkbd-util.c | |
| parent | b17c36f46bb68f18406cb059ac8674382eb8b54e (diff) | |
| download | libgnomekbd-df25f12b1075f19deb0782235da8d20bbb2d7360.tar.gz | |
Fix a crash where the GSettings key was provided as a path
Diffstat (limited to 'libgnomekbd/gkbd-util.c')
| -rw-r--r-- | libgnomekbd/gkbd-util.c | 19 |
1 files changed, 6 insertions, 13 deletions
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); |