[accounts-dialog] Name model columns, use dots to indicate a password

[Matthias Clasen <matthiasc src gnome org>]

commit c89818472c69b349206effffc5201eeb671a508e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 15 00:22:49 2010 -0500

    Name model columns, use dots to indicate a password

 src/main.c |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 162e980..c10960a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,19 @@ get_widget (UserAccountDialog *d, const char *name)
         return (GtkWidget *)gtk_builder_get_object (d->builder, name);
 }
 
+enum {
+        USER_COL,
+        FACE_COL,
+        NAME_COL,
+        NUM_USER_LIST_COLS
+};
+
+enum {
+        AUTOLOGIN_NAME_COL,
+        AUTOLOGIN_USER_COL,
+        NUM_AUTOLOGIN_COLS
+};
+
 static UmUser *
 get_selected_user (UserAccountDialog *d)
 {
@@ -82,7 +95,7 @@ get_selected_user (UserAccountDialog *d)
         selection = gtk_tree_view_get_selection (tv);
 
         if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-                gtk_tree_model_get (model, &iter, 0, &user, -1);
+                gtk_tree_model_get (model, &iter, USER_COL, &user, -1);
                 return user;
         }
 
@@ -113,7 +126,11 @@ user_added (UmUserManager *um, UmUser *user, UserAccountDialog *d)
                                 um_account_type_get_name (um_user_get_account_type (user)));
 
         gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, user, 1, pixbuf, 2, text, -1);
+        gtk_list_store_set (store, &iter,
+                            USER_COL, user,
+                            FACE_COL, pixbuf,
+                            NAME_COL, text,
+                            -1);
         g_object_unref (pixbuf);
         g_free (text);
 
@@ -125,7 +142,10 @@ user_added (UmUserManager *um, UmUser *user, UserAccountDialog *d)
         widget = get_widget (d, "dm-automatic-login-combobox");
         store = (GtkListStore*)gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
         gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, um_user_get_real_name (user), 1, user, -1);
+        gtk_list_store_set (store, &iter,
+                            AUTOLOGIN_NAME_COL, um_user_get_real_name (user),
+                            AUTOLOGIN_USER_COL, user,
+                            -1);
 }
 
 static void
@@ -157,7 +177,7 @@ user_removed (UmUserManager *um, UmUser *user, UserAccountDialog *d)
         store = (GtkListStore *)model;
         if (gtk_tree_model_get_iter_first (model, &iter)) {
                 do {
-                        gtk_tree_model_get (model, &iter, 0, &u, -1);
+                        gtk_tree_model_get (model, &iter, USER_COL, &u, -1);
 
                         if (um_user_get_uid (user) == um_user_get_uid (u)) {
                                 next = iter;
@@ -177,7 +197,7 @@ user_removed (UmUserManager *um, UmUser *user, UserAccountDialog *d)
         model = gtk_combo_box_get_model (combo);
         store = (GtkListStore*)model;
         gtk_combo_box_get_active_iter (combo, &iter);
-        gtk_tree_model_get (model, &iter, 1, &u, -1);
+        gtk_tree_model_get (model, &iter, AUTOLOGIN_USER_COL, &u, -1);
         if (u != NULL) {
                 if (um_user_get_uid (user) == um_user_get_uid (u)) {
                         /* autologin user got removed, set back to Disabled */
@@ -190,7 +210,7 @@ user_removed (UmUserManager *um, UmUser *user, UserAccountDialog *d)
         }
         if (gtk_tree_model_get_iter_first (model, &iter)) {
                 do {
-                        gtk_tree_model_get (model, &iter, 1, &u, -1);
+                        gtk_tree_model_get (model, &iter, AUTOLOGIN_USER_COL, &u, -1);
 
                         if (u != NULL) {
                                 if (um_user_get_uid (user) == um_user_get_uid (u)) {
@@ -223,14 +243,18 @@ user_changed (UmUserManager *um, UmUser *user, UserAccountDialog *d)
 
         gtk_tree_model_get_iter_first (model, &iter);
         do {
-                gtk_tree_model_get (model, &iter, 0, &current, -1);
+                gtk_tree_model_get (model, &iter, USER_COL, &current, -1);
                 if (current == user) {
                         pixbuf = um_user_render_icon (user, TRUE, 48);
                         text = g_strdup_printf ("<b>%s</b>\n<i>%s</i>",
                                                 um_user_get_real_name (user),
                                                 um_account_type_get_name (um_user_get_account_type (user)));
 
-                        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, user, 1, pixbuf, 2, text, -1);
+                        gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                            USER_COL, user,
+                                            FACE_COL, pixbuf,
+                                            NAME_COL, text,
+                                            -1);
                         g_object_unref (pixbuf);
                         g_free (text);
 
@@ -239,7 +263,7 @@ user_changed (UmUserManager *um, UmUser *user, UserAccountDialog *d)
         } while (gtk_tree_model_iter_next (model, &iter));
 
         if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-                gtk_tree_model_get (model, &iter, 0, &current, -1);
+                gtk_tree_model_get (model, &iter, USER_COL, &current, -1);
 
                 if (current == user) {
                         show_user (user, d);
@@ -347,7 +371,7 @@ show_user (UmUser *user, UserAccountDialog *d)
         label = get_widget (d, "account-password-value-label");
         switch (um_user_get_password_mode (user)) {
         case UM_PASSWORD_MODE_REGULAR:
-                text = C_("Password mode", "Set");
+                text = "\xe2\x80\xa2\xe2\x80\xa2\xe2\x80\xa2\xe2\x80\xa2\xe2\x80\xa2";
                 break;
         case UM_PASSWORD_MODE_SET_AT_LOGIN:
                 text = C_("Password mode", "To be set at next login");
@@ -407,7 +431,7 @@ selected_user_changed (GtkTreeSelection *selection, UserAccountDialog *d)
         UmUser *user;
 
         if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-                gtk_tree_model_get (model, &iter, 0, &user, -1);
+                gtk_tree_model_get (model, &iter, USER_COL, &user, -1);
                 show_user (user, d);
                 g_object_unref (user);
 
@@ -552,8 +576,8 @@ sort_users (GtkTreeModel *model,
         UmUser *ua, *ub;
         gint result;
 
-        gtk_tree_model_get (model, a, 0, &ua, -1);
-        gtk_tree_model_get (model, b, 0, &ub, -1);
+        gtk_tree_model_get (model, a, USER_COL, &ua, -1);
+        gtk_tree_model_get (model, b, USER_COL, &ub, -1);
 
         if (um_user_get_uid (ua) == getuid ())
                 result = -1;
@@ -660,8 +684,8 @@ sort_login_users (GtkTreeModel *model,
         UmUser *ua, *ub;
         gint result;
 
-        gtk_tree_model_get (model, a, 1, &ua, -1);
-        gtk_tree_model_get (model, b, 1, &ub, -1);
+        gtk_tree_model_get (model, a, AUTOLOGIN_USER_COL, &ua, -1);
+        gtk_tree_model_get (model, b, AUTOLOGIN_USER_COL, &ub, -1);
 
         if (ua == NULL)
                 result = -1;