From 79c44785180728fb53b2a7cc9b9512619fe45a79 Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Fri, 3 May 2013 10:46:46 -0500 Subject: Clean up compile, fix bug with handling variants. Closes #8 --- libmatekbd/matekbd-indicator.c | 8 +++++--- libmatekbd/matekbd-status.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'libmatekbd') diff --git a/libmatekbd/matekbd-indicator.c b/libmatekbd/matekbd-indicator.c index 0a43af1..dcb65e9 100644 --- a/libmatekbd/matekbd-indicator.c +++ b/libmatekbd/matekbd-indicator.c @@ -202,10 +202,12 @@ matekbd_indicator_fill (MatekbdIndicator * gki) for (grp = 0; grp < total_groups; grp++) { GtkWidget *page; +#if 0 gchar *full_group_name = (grp < g_strv_length (globals.full_group_names)) ? globals.full_group_names[grp] : "?"; +#endif page = matekbd_indicator_prepare_drawing (gki, grp); if (page == NULL) @@ -527,10 +529,10 @@ matekbd_indicator_load_group_names (const gchar ** layout_ids, if (xkl_engine_get_features (globals.engine) & XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { - GSList *lst = globals.kbd_cfg.layouts_variants; - for (i = 0; lst; lst = lst->next, i++) { + gchar **lst = globals.kbd_cfg.layouts_variants; + for (i = 0; *lst; lst++, i++) { globals.full_group_names[i] = - g_strdup ((char *) lst->data); + g_strdup ((char *) *lst); } } else { for (i = total_groups; --i >= 0;) { diff --git a/libmatekbd/matekbd-status.c b/libmatekbd/matekbd-status.c index 2462910..d363260 100644 --- a/libmatekbd/matekbd-status.c +++ b/libmatekbd/matekbd-status.c @@ -472,10 +472,10 @@ matekbd_status_load_group_names (const gchar ** layout_ids, if (xkl_engine_get_features (globals.engine) & XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { - GSList *lst = globals.kbd_cfg.layouts_variants; - for (i = 0; lst; lst = lst->next, i++) { + gchar **lst = globals.kbd_cfg.layouts_variants; + for (i = 0; *lst; lst++, i++) { globals.full_group_names[i] = - g_strdup ((char *) lst->data); + g_strdup ((char *) *lst); } } else { for (i = total_groups; --i >= 0;) { -- cgit v1.2.1