diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2011-03-01 11:30:38 +0000 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2011-03-01 20:19:19 +0000 |
| commit | 7619974c84fe0f83b5ffead20ad15975943ab53b (patch) | |
| tree | d1e3c1cf2e40ab86b14a0234b26f092f1f4198ae /libgnomekbd/gkbd-desktop-config.c | |
| parent | ec7d42f4df74d2a46add292caf644a7472a4e403 (diff) | |
| download | libgnomekbd-7619974c84fe0f83b5ffead20ad15975943ab53b.tar.gz | |
The latest changes in xk-c: variants contain full descriptions
The formatting of the visible strings changes: no need to prepend the layout
description to the variant description.
Diffstat (limited to 'libgnomekbd/gkbd-desktop-config.c')
| -rw-r--r-- | libgnomekbd/gkbd-desktop-config.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libgnomekbd/gkbd-desktop-config.c b/libgnomekbd/gkbd-desktop-config.c index beddec1..f3f6181 100644 --- a/libgnomekbd/gkbd-desktop-config.c +++ b/libgnomekbd/gkbd-desktop-config.c @@ -297,11 +297,12 @@ gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig plvd = lvd; psvd = svd; while (plld != NULL && *plld != NULL) { - gchar *sd = (*psvd[0] == '\0') ? *psld : *psvd; + *psgn++ = g_strdup ((*psvd[0] == '\0') ? *psld : *psvd); + *pfgn++ = + g_strdup (gkbd_keyboard_config_format_full_description + (*plld++, *plvd++)); psld++, psvd++; - *psgn++ = g_strdup (sd); - *pfgn++ = g_strdup (gkbd_keyboard_config_format_full_layout - (*plld++, *plvd++)); + plld++, plvd++; } g_strfreev (sld); g_strfreev (lld); |