--- gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c.keyboard-indicator-segfault	2006-08-12 21:26:53.000000000 -0400
+++ gnome-applets-2.16.0.1/libgswitchit/gnome-kbd-indicator.c	2006-09-18 09:23:54.000000000 -0400
@@ -410,18 +410,22 @@
 		    xkl_engine_get_num_groups (globals.engine);
 		globals.full_group_names =
 		    g_new0 (char *, total_groups + 1);
+		globals.short_group_names =
+		    g_new0 (char *, total_groups + 1);
 
 		if (xkl_engine_get_features (globals.engine) &
 		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
 			GSList *lst = globals.kbd_cfg.layouts;
-			for (i = 0; lst; lst = lst->next) {
-				globals.full_group_names[i++] =
-				    g_strdup ((char *) lst->data);
+			for (i = 0; lst; lst = lst->next,i++) {
+				globals.short_group_names[i] = 
+				  globals.full_group_names[i] =
+				  g_strdup ((char *) lst->data);
 			}
 		} else {
 			for (i = total_groups; --i >= 0;) {
-				globals.full_group_names[i] =
-				    g_strdup_printf ("Group %d", i);
+				globals.short_group_names[i] =
+				  globals.full_group_names[i] =
+				  g_strdup_printf ("Group %d", i);
 			}
 		}
 	}