[accounts-dialog] Use symbolic names for columns

[Bastien Nocera <hadess src gnome org>]

commit a9a29db51ea22bed3e0bf3f7ce7db4e4731332aa
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 13 13:13:31 2010 +0000

    Use symbolic names for columns

 src/um-language-dialog.c |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/src/um-language-dialog.c b/src/um-language-dialog.c
index 3ab7267..9edc5e0 100644
--- a/src/um-language-dialog.c
+++ b/src/um-language-dialog.c
@@ -47,6 +47,12 @@ struct _UmLanguageDialog {
         UmUser *user;
 };
 
+enum {
+	LOCALE_COL,
+	DISPLAY_LOCALE_COL,
+	NUM_COLS
+};
+
 static void
 cancel_language_dialog (GtkButton        *button,
                         UmLanguageDialog *um)
@@ -75,8 +81,8 @@ sort_languages (GtkTreeModel *model,
         char *la, *lb;
         gint result;
 
-        gtk_tree_model_get (model, a, 0, &ca, 1, &la, -1);
-        gtk_tree_model_get (model, b, 0, &cb, 1, &lb, -1);
+        gtk_tree_model_get (model, a, LOCALE_COL, &ca, DISPLAY_LOCALE_COL, &la, -1);
+        gtk_tree_model_get (model, b, LOCALE_COL, &cb, DISPLAY_LOCALE_COL, &lb, -1);
 
         if (!ca)
                 result = 1;
@@ -114,7 +120,7 @@ select_language (UmLanguageDialog *um,
 
         gtk_tree_model_get_iter_first (model, &iter);
         do {
-                gtk_tree_model_get (model, &iter, 0, &l, -1);
+                gtk_tree_model_get (model, &iter, LOCALE_COL, &l, -1);
                 if (g_strcmp0 (l, lang) == 0) {
                         gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
                         g_free (l);
@@ -128,7 +134,7 @@ select_language (UmLanguageDialog *um,
                 language = gdm_get_language_from_name (name, NULL);
 
                 gtk_list_store_append (um->dialog_store, &iter);
-                gtk_list_store_set (um->dialog_store, &iter, 0, name, 1, language, -1);
+                gtk_list_store_set (um->dialog_store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
                 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
 
                 g_free (name);
@@ -154,7 +160,7 @@ accept_language_chooser (GtkButton        *button,
 
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (um->chooser_list));
         if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-                gtk_tree_model_get (model, &iter, 0, &language, -1);
+                gtk_tree_model_get (model, &iter, LOCALE_COL, &language, -1);
                 select_language (um, language);
                 g_free (language);
         }
@@ -176,7 +182,7 @@ row_activated (GtkTreeView       *tree_view,
         model = gtk_tree_view_get_model (tree_view);
         gtk_tree_model_get_iter (model, &iter, path);
 
-        gtk_tree_model_get (model, &iter, 0, &language, -1);
+        gtk_tree_model_get (model, &iter, LOCALE_COL, &language, -1);
         select_language (um, language);
         g_free (language);
 }
@@ -260,7 +266,7 @@ add_available_languages (GtkListStore *store)
                 language = gdm_get_language_from_name (name, NULL);
 
                 gtk_list_store_append (store, &iter);
-                gtk_list_store_set (store, &iter, 0, name, 1, language, -1);
+                gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
 
                 g_free (name);
                 g_free (language);
@@ -306,7 +312,7 @@ add_user_languages (GtkListStore *store)
 
                 language = gdm_get_language_from_name (name, NULL);
                 gtk_list_store_append (store, &iter);
-                gtk_list_store_set (store, &iter, 0, name, 1, language, -1);
+                gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
 
                 g_free (name);
                 g_free (language);
@@ -326,14 +332,14 @@ add_user_languages (GtkListStore *store)
 
                 language = gdm_get_language_from_name (name, NULL);
                 gtk_list_store_append (store, &iter);
-                gtk_list_store_set (store, &iter, 0, name, 1, language, -1);
+                gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
 
                 g_free (name);
                 g_free (language);
         }
 
         gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, NULL, 1, _("Other..."), -1);
+        gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
 }
 
 static void
@@ -377,9 +383,9 @@ setup_language_chooser (UmLanguageDialog *um)
         gtk_widget_grab_default (button);
 
         cell = gtk_cell_renderer_text_new ();
-        column = gtk_tree_view_column_new_with_attributes (NULL, cell, "text", 1, NULL);
+        column = gtk_tree_view_column_new_with_attributes (NULL, cell, "text", DISPLAY_LOCALE_COL, NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
-        store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+        store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
         gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
                                                  sort_languages, NULL, NULL);
         gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
@@ -405,7 +411,7 @@ language_combo_changed (GtkComboBox      *combo,
         if (!gtk_combo_box_get_active_iter (combo, &iter))
                 return;
 
-        gtk_tree_model_get (GTK_TREE_MODEL (um->dialog_store), &iter, 0, &lang, -1);
+        gtk_tree_model_get (GTK_TREE_MODEL (um->dialog_store), &iter, LOCALE_COL, &lang, -1);
 
         if (lang) {
                 g_free (um->language);