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 da7f1f1..6d08c40 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -75,7 +75,27 @@ gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* na
        
        return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
 }
+
+
+ModestTransportStoreProtocol modest_account_mgr_get_store_protocol (ModestAccountMgr *self, const gchar* name)
+{
+       ModestTransportStoreProtocol result = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default */
        
+       gchar *server_account_name = modest_account_mgr_get_string (self, name,
+                                                       MODEST_ACCOUNT_STORE_ACCOUNT,
+                                                       FALSE);
+       if (server_account_name) {
+               ModestServerAccountData* server_data = 
+                       modest_account_mgr_get_server_account_data (self, server_account_name);
+               result = server_data->proto;
+                       
+               modest_account_mgr_free_server_account_data (self, server_data);
+               
+               g_free (server_account_name);
+       }
+       
+       return result;
+}
 
 gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self, 
        const gchar* account_name,
@@ -258,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)
@@ -550,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
@@ -573,17 +614,13 @@ gint on_accounts_list_sort_by_title(gconstpointer a, gconstpointer b)
        return g_utf8_collate((const gchar*)a, (const gchar*)b);
 }
 
-
-static void
-free_element (gpointer data, gpointer user_data)
-{
-       g_free (data);
-}
-
 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 */
@@ -591,17 +628,31 @@ 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);
        }
-       
-       g_slist_foreach (account_names, free_element, NULL);
-       g_slist_free (account_names);
-       
+
+       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;
+
        return result;
 }