[gnome-control-center] region: Simplify xkb_layouts_fill_selected_tree()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] region: Simplify xkb_layouts_fill_selected_tree()
- Date: Fri, 21 Jan 2011 17:12:15 +0000 (UTC)
commit e7a82d58e423ed6f38fec6c0cb02039b365d5d7a
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jan 21 17:08:02 2011 +0000
region: Simplify xkb_layouts_fill_selected_tree()
panels/region/gnome-region-panel-xkblt.c | 39 +++++++++++++-----------------
1 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/panels/region/gnome-region-panel-xkblt.c b/panels/region/gnome-region-panel-xkblt.c
index 98308ea..5661aee 100644
--- a/panels/region/gnome-region-panel-xkblt.c
+++ b/panels/region/gnome-region-panel-xkblt.c
@@ -271,38 +271,33 @@ void
xkb_layouts_fill_selected_tree (GtkBuilder * dialog)
{
gchar **layouts = xkb_layouts_get_selected_list ();
- gchar **cur_layout;
+ guint i;
GtkListStore *list_store =
GTK_LIST_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW
(WID ("xkb_layouts_selected"))));
- int counter = 0;
/* temporarily disable the buttons' status update */
disable_buttons_sensibility_update = TRUE;
gtk_list_store_clear (list_store);
- cur_layout = layouts;
- if (layouts != NULL) {
- while (*cur_layout != NULL) {
- GtkTreeIter iter;
- const char *visible = *cur_layout;
- gchar *utf_visible =
- xkb_layout_description_utf8 (visible);
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter,
- SEL_LAYOUT_TREE_COL_DESCRIPTION,
- utf_visible,
- SEL_LAYOUT_TREE_COL_ID,
- *cur_layout,
- SEL_LAYOUT_TREE_COL_ENABLED,
- counter < max_selected_layouts,
- -1);
- g_free (utf_visible);
- cur_layout++;
- counter++;
- }
+ for (i = 0; layouts != NULL && layouts[i] != NULL; i++) {
+ GtkTreeIter iter;
+ char *cur_layout = layouts[i];
+ gchar *utf_visible =
+ xkb_layout_description_utf8 (cur_layout);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter,
+ SEL_LAYOUT_TREE_COL_DESCRIPTION,
+ utf_visible,
+ SEL_LAYOUT_TREE_COL_ID,
+ cur_layout,
+ SEL_LAYOUT_TREE_COL_ENABLED,
+ i < max_selected_layouts,
+ -1);
+ g_free (utf_visible);
}
g_strfreev (layouts);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]