Fixes NB#96198, sort account titles by account name in default account picker

pmo-trunk-r6930

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 9d1ab65..0b3ba27 100644 (file)
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -365,10 +365,10 @@ commit_contact(EContact * contact, gboolean is_new)
 {
        g_return_if_fail (contact);
        g_return_if_fail (book);
 {
        g_return_if_fail (contact);
        g_return_if_fail (book);

-       
+

        if (!contact || !book)
                return;
        if (!contact || !book)
                return;

-       
+

 #if MODEST_ABOOK_API < 4
        osso_abook_contact_commit(contact, is_new, book);
 #else
 #if MODEST_ABOOK_API < 4
        osso_abook_contact_commit(contact, is_new, book);
 #else

diff --git a/src/hildon2/modest-hildon2-global-settings-dialog.c b/src/hildon2/modest-hildon2-global-settings-dialog.c
index 5f8afc6..29873cc 100644 (file)
--- a/src/hildon2/modest-hildon2-global-settings-dialog.c
+++ b/src/hildon2/modest-hildon2-global-settings-dialog.c
@@ -397,7 +397,30 @@ current_connection (void)
        return modest_platform_get_current_connection ();
 }
 
        return modest_platform_get_current_connection ();
 }
 

-static ModestPairList * 
+static gint
+order_by_acc_name (gconstpointer a,
+                  gconstpointer b)
+{
+       ModestPair *pair_a, *pair_b;
+
+       pair_a = (ModestPair *) a;
+       pair_b = (ModestPair *) b;
+
+       if (pair_a->second && pair_b->second) {
+               gint compare = g_utf8_collate ((gchar *) pair_a->second,
+                                              (gchar *) pair_b->second);
+               if (compare > 0)
+                       compare = -1;
+               else if (compare < 0)
+                       compare = 1;
+
+               return compare;
+       } else {
+               return 0;
+       }
+}
+
+static ModestPairList *

 get_accounts_list (void)
 {
        GSList *list = NULL;
 get_accounts_list (void)
 {
        GSList *list = NULL;

@@ -411,9 +434,9 @@ get_accounts_list (void)
                gchar *account_name;
                ModestAccountSettings *settings;
                ModestServerAccountSettings *store_settings;
                gchar *account_name;
                ModestAccountSettings *settings;
                ModestServerAccountSettings *store_settings;

-               
+

                account_name = (gchar*)cursor->data;
                account_name = (gchar*)cursor->data;

-               
+

                settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
                if (!settings) {
                        g_printerr ("modest: failed to get account data for %s\n", account_name);
                settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
                if (!settings) {
                        g_printerr ("modest: failed to get account data for %s\n", account_name);

@@ -431,7 +454,7 @@ get_accounts_list (void)
                                        g_strdup (account_name),
                                        g_strdup (modest_account_settings_get_display_name (settings)),
                                        FALSE);
                                        g_strdup (account_name),
                                        g_strdup (modest_account_settings_get_display_name (settings)),
                                        FALSE);

-                               list = g_slist_prepend (list, pair);
+                               list = g_slist_insert_sorted (list, pair, order_by_acc_name);

                        }
                }
 
                        }
                }