Merge lp:~amigadave/gnome-control-center-signon/add-account-order into lp:gnome-control-center-signon

[David King]

Add new accounts to the bottom of the account list (but above the ‘Add accounts…’ row)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:110
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/52/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/52/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

The code looks good and delivers the described functionality. But please verify with Calum whether this is actually desired (I'm not sure what problem we are trying to solve -- if it's about visibility of the new account, shouldn't we also select it as well)?

[David King (amigadave)]

The specification already says “The user’s accounts are listed in the order in which they are created.”, so this is just fixing up some previously-unnoticed behaviour, as before this change the account appeared at the top of the list (which was then sorted correctly after closing and opening the panel).

The UI specification indeed says that “[once] the account is created … information is shown about which applications on the desktop will use the account.” which means that the new account should be selected too. Fixing that should be quite straightforward.

[lp:~amigadave/gnome-control-center-signon/add-account-order]

111. By David King on 2012-09-28

Select new accounts automatically

The UI specification says that once “the account is created …
information is shown about which applications on the desktop will use
the account.” which means that the newly-created account should be
selected.

[David King (amigadave)]

This works well for me.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:111
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/53/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/53/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

And for me too :-)

review: Approve

=== modified file 'src/cc-credentials-accounts-model.vala'
--- src/cc-credentials-accounts-model.vala	2012-07-09 11:19:21 +0000
+++ src/cc-credentials-accounts-model.vala	2012-09-28 12:48:19 +0000
@@ -97,10 +97,6 @@
         set_column_types (types);
 
         accounts_manager = new Ag.Manager ();
-        var accounts = accounts_manager.list ();
-
-        accounts.foreach (add_account);
-
         // Add a placeholder row at the end of the list.
         var add_account_text = _("Add account…");
 
@@ -116,7 +112,7 @@
             message ("Error looking up themed add icon: %s", error.message);
         }
 
-        insert_with_values (null, int.MAX,
+        insert_with_values (null, 0,
                             ModelColumns.ACCOUNT_ID, 0,
                             ModelColumns.PROVIDER_ICON, provider_icon,
                             ModelColumns.ACCOUNT_DESCRIPTION, add_account_text,
@@ -124,6 +120,12 @@
                             ModelColumns.NEEDS_ATTENTION, false,
                             -1);
 
+        var accounts = accounts_manager.list ();
+
+        // Sort by account ID.
+        accounts.sort ((a, b) => { return (int)a - (int)b; });
+        accounts.foreach (add_account);
+
         try
         {
 
@@ -169,8 +171,11 @@
             return;
         }
 
+        /* Insert the new account at the bottom of the list of accounts, but
+         * before the ‘Add account’ row.
+         */
         var record = fill_column_record (account_id);
-        insert_with_values (null, 0,
+        insert_with_values (null, this.iter_n_children (null) - 1,
                             ModelColumns.ACCOUNT_ID, record.account_id,
                             ModelColumns.ACCOUNT, record.account,
                             ModelColumns.PROVIDER_ICON, record.icon,
 
=== modified file 'src/cc-credentials-accounts-page.vala'
--- src/cc-credentials-accounts-page.vala	2012-09-26 14:38:12 +0000
+++ src/cc-credentials-accounts-page.vala	2012-09-28 12:48:19 +0000
@@ -106,6 +106,9 @@
         var selection = accounts_tree.get_selection ();
         on_accounts_selection_changed (selection);
 
+        // Update the selection if a new account was added.
+        accounts_store.row_inserted.connect (on_accounts_store_row_inserted);
+
         set_size_request (-1, 400);
 
         show ();
@@ -408,4 +411,17 @@
     {
         account_edit_options_request (plugin);
     }
+
+    /**
+     * Select the newly-added row, as required by the UI specification.
+     *
+     * @param path the Gtk.TreePath of the newly-added row
+     * @param iter the Gtk.TreeIter of the newly-added row
+     */
+    private void on_accounts_store_row_inserted (Gtk.TreePath path,
+                                                 Gtk.TreeIter iter)
+    {
+        var selection = accounts_tree.get_selection ();
+        selection.select_iter (iter);
+    }
 }