gnome-control-center r8929 - trunk/capplets/keyboard

[svu svn gnome org]

Author: svu
Date: Fri Sep  5 23:29:10 2008
New Revision: 8929
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8929&view=rev

Log:
accomodate latest changes in libxklavier: counting on utf-8 in descriptions

Modified:
   trunk/capplets/keyboard/ChangeLog
   trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c
   trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	Fri Sep  5 23:29:10 2008
@@ -48,8 +48,7 @@
 xci_desc_to_utf8 (XklConfigItem * ci)
 {
 	char *sd = g_strstrip (ci->description);
-	return sd[0] == 0 ? g_strdup (ci->name) :
-	    g_locale_to_utf8 (sd, -1, NULL, NULL, NULL);
+	return sd[0] == 0 ? g_strdup (ci->name) : g_strdup (sd);
 }
 
 static void
@@ -88,7 +87,8 @@
 model_key_changed (GConfClient * client,
 		   guint cnxn_id, GConfEntry * entry, GladeXML * dialog)
 {
-	set_model_text (WID ("xkb_model_pick"), gconf_entry_get_value (entry));
+	set_model_text (WID ("xkb_model_pick"),
+			gconf_entry_get_value (entry));
 
 	enable_disable_restoring (dialog);
 }

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	Fri Sep  5 23:29:10 2008
@@ -365,15 +365,10 @@
 xkb_layout_description_utf8 (const gchar * visible)
 {
 	char *l, *sl, *v, *sv;
-	char *v1, *utf_visible;
 	if (gkbd_keyboard_config_get_descriptions
 	    (config_registry, visible, &sl, &l, &sv, &v))
 		visible = gkbd_keyboard_config_format_full_layout (l, v);
-	v1 = g_strdup (visible);
-	utf_visible =
-	    g_locale_to_utf8 (g_strstrip (v1), -1, NULL, NULL, NULL);
-	g_free (v1);
-	return utf_visible;
+	return g_strstrip (g_strdup (visible));
 }
 
 void