2007-07-31 Philip Van Hoof <pvanhoof@gnome.org>

[modest] / src / modest-account-mgr-helpers.c

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 96f5556..6d08c40 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -278,6 +278,29 @@ modest_server_account_set_password (ModestAccountMgr *self, const gchar* account
        modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
                                       password, TRUE /* server account */);
 }
+
+       
+gchar*
+modest_server_account_get_password (ModestAccountMgr *self, const gchar* account_name)
+{
+       return modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
+               TRUE /* server account */);     
+}
+
+gboolean
+modest_server_account_get_has_password (ModestAccountMgr *self, const gchar* account_name)
+{
+       gboolean result = FALSE;
+       gchar *password = modest_account_mgr_get_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
+               TRUE /* server account */);
+       if (password && strlen (password)) {
+               result = TRUE;
+       }
+       
+       g_free (password);
+       return result;
+}
+                        
        
 gchar*
 modest_server_account_get_hostname (ModestAccountMgr *self, const gchar* account_name)
@@ -570,9 +593,7 @@ modest_account_mgr_set_default_account  (ModestAccountMgr *self, const gchar* ac
        
        conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
 
-       return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
-                                      account, NULL);
-
+       return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, account, NULL);
 }
 
 gboolean
@@ -594,9 +615,12 @@ gint on_accounts_list_sort_by_title(gconstpointer a, gconstpointer b)
 }
 
 gboolean
-modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
+modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
 {
-       gboolean result = FALSE;
+       gchar *old_default;
+       gboolean result = FALSE, found;
+       GSList* list_sorted, *iter;
+       const gchar* account_name = NULL;
        GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
 
        /* Return TRUE if there is no account */
@@ -604,14 +628,28 @@ modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
                return TRUE;
                
        /* Get the first one, alphabetically, by title: */
-       GSList* list_sorted = g_slist_sort (account_names, 
-               on_accounts_list_sort_by_title);
-       if(list_sorted) {
-               const gchar* account_name = (const gchar*)list_sorted->data;
-               if (account_name) 
-                       result = modest_account_mgr_set_default_account (self, account_name);
+       old_default = modest_account_mgr_get_default_account (self);
+       list_sorted = g_slist_sort (account_names, on_accounts_list_sort_by_title);
+
+       iter = list_sorted;
+       found = FALSE;
+       while (iter && !found) {
+               account_name = (const gchar*)list_sorted->data;
+
+               if (old_default) {
+                       /* The new should be different than the old one */
+                       if (strcmp (old_default, account_name))
+                               found = TRUE;
+               } else
+                       found = TRUE;
+
+               if (!found)
+                       iter = g_slist_next (iter);
        }
 
+       if (found && account_name)
+               result = modest_account_mgr_set_default_account (self, account_name);
+
        modest_account_mgr_free_account_names (account_names);
        account_names = NULL;