applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn path=/trunk/; revision=8929
This commit is contained in:
Sergey V. Udaltsov 2008-09-05 23:29:10 +00:00
parent dab7c11694
commit 3db2ae2107
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -48,8 +48,7 @@ char *
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 @@ static void
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);
}