X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=5d05bb4185b5f0252b98a75ef7c8a09077b58cb7;hp=42eaa1dcafea8c953cf7bdfd22e682b9edf4b2af;hb=12f0687cf55bb339ad9892cbce8c7d35a6509af5;hpb=eed204e3afa5e864f1329725cb5adc8764991a2a

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 42eaa1d..5d05bb4 100644
--- 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,
@@ -240,7 +260,7 @@ gboolean
 modest_server_account_get_username_has_succeeded (ModestAccountMgr *self, const gchar* account_name)
 {
 	return modest_account_mgr_get_bool (self, account_name, MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED, 
-		TRUE /* server account */);
+					    TRUE /* server account */);
 }
 
 void
@@ -248,16 +268,39 @@ modest_server_account_set_username_has_succeeded (ModestAccountMgr *self, const
 	gboolean succeeded)
 {
 	modest_account_mgr_set_bool (self, account_name, MODEST_ACCOUNT_USERNAME_HAS_SUCCEEDED, 
-		succeeded, TRUE /* server account */);
+				     succeeded, TRUE /* server account */);
 }
 
 void
 modest_server_account_set_password (ModestAccountMgr *self, const gchar* account_name, 
-	const gchar* password)
+				    const gchar* password)
 {
 	modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD, 
-		password, TRUE /* server account */);
+				       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)
@@ -527,13 +570,6 @@ modest_account_mgr_get_default_account  (ModestAccountMgr *self)
 		return  NULL;
 	}
 	
-	/* Make sure that at least one account is always the default, if possible:
-	 * (It would be meaningless to have enabled accounts but no default account. */
-	if (!account) {
-		modest_account_mgr_set_first_account_as_default (self);
-		account = modest_conf_get_string (conf, MODEST_CONF_DEFAULT_ACCOUNT, &err);
-	}
-
 	/* sanity check */
 	if (account && !modest_account_mgr_account_exists (self, account, FALSE)) {
 		g_printerr ("modest: default account does not exist\n");
@@ -556,7 +592,7 @@ modest_account_mgr_set_default_account  (ModestAccountMgr *self, const gchar* ac
 			      FALSE);
 	
 	conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
-		
+
 	return modest_conf_set_string (conf, MODEST_CONF_DEFAULT_ACCOUNT,
 				       account, NULL);
 
@@ -581,24 +617,44 @@ 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 */
+	if (!account_names)
+		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);
 	}
-	
-	/* TODO: Free the strings too? */
-	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;
 }