[libgnomekbd] Use variant-specific short descriptions, if available

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

commit d27cb9b53c1c8a361f752e1008c993e2d37acb6c
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Tue Jan 18 00:36:35 2011 +0000

    Use variant-specific short descriptions, if available
    
    As discussed on
    https://bugzilla.gnome.org/show_bug.cgi?id=600771

 libgnomekbd/gkbd-desktop-config.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libgnomekbd/gkbd-desktop-config.c b/libgnomekbd/gkbd-desktop-config.c
index 0e5029c..beddec1 100644
--- a/libgnomekbd/gkbd-desktop-config.c
+++ b/libgnomekbd/gkbd-desktop-config.c
@@ -276,7 +276,7 @@ gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig
 {
 	gchar **sld, **lld, **svd, **lvd;
 	gchar **psld, **plld, **plvd;
-	gchar **psgn, **pfgn;
+	gchar **psgn, **pfgn, **psvd;
 	gint total_descriptions;
 
 	if (!gkbd_desktop_config_get_lv_descriptions
@@ -295,8 +295,11 @@ gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig
 	plld = lld;
 	psld = sld;
 	plvd = lvd;
+	psvd = svd;
 	while (plld != NULL && *plld != NULL) {
-		*psgn++ = g_strdup (*psld++);
+		gchar *sd = (*psvd[0] == '\0') ? *psld : *psvd;
+		psld++, psvd++;
+		*psgn++ = g_strdup (sd);
 		*pfgn++ = g_strdup (gkbd_keyboard_config_format_full_layout
 				    (*plld++, *plvd++));
 	}