X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=441dbff5ba3fdc40e159504db8521ceb45b27bf6;hb=fb1f5d982174b35cd14a85c99952b68c31c6cbc1;hp=bfa0c55dda7dd4921c38be089e13773a90cba105;hpb=e280f234bf1af418007d2dc406c9cffcfa5161a8;p=modest

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index bfa0c55..441dbff 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -174,14 +174,34 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self,
 						    MODEST_CONF_VALUE_STRING, FALSE);
 	if (!list)
 		return NULL;
-		
+
 	/* The server account is in the item after the connection name: */
-	GSList *list_connection = g_slist_find_custom (list, connection_name, (GCompareFunc)strcmp);
-	if (list_connection) {
-		GSList * list_server_account = g_slist_next(list_connection);
-		if (list_server_account)
-			result = g_strdup ((gchar*)(list_server_account->data));
+	GSList *iter = list;
+	while (iter) {
+		const gchar* this_connection_name = (const gchar*)(iter->data);
+		if (strcmp (this_connection_name, connection_name) == 0) {
+			iter = g_slist_next (iter);
+			
+			if (iter) {
+				const gchar* account_name = (const gchar*)(iter->data);
+				if (account_name) {
+					result = g_strdup (account_name);
+					break;
+				}
+			}
+		}
+		
+		/* Skip 2 to go to the next connection in the list: */
+		iter = g_slist_next (iter);
+		if (iter)
+			iter = g_slist_next (iter);
+	}
+		
+	/*
+	if (!result) {
+		printf ("  debug: no server found for connection_name=%s.\n", connection_name);	
 	}
+	*/
 				
 	/* TODO: Should we free the items too, or just the list? */
 	g_slist_free (list);
@@ -220,7 +240,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
@@ -228,15 +248,15 @@ 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*
@@ -304,9 +324,10 @@ get_security_for_conf_string(const gchar* value)
 	if (value) {
 		if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NONE) == 0)
 			result = MODEST_PROTOCOL_CONNECTION_NORMAL;
-		else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0)
+		else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_NORMAL) == 0) {
+			/* The UI has "Normal (TLS)": */
 			result = MODEST_PROTOCOL_CONNECTION_TLS;
-		else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
+		} else if (strcmp(value, MODEST_ACCOUNT_SECURITY_VALUE_SSL) == 0)
 			result = MODEST_PROTOCOL_CONNECTION_SSL;
 	}
 	
@@ -337,9 +358,10 @@ modest_server_account_set_security (ModestAccountMgr *self,
 	const gchar* str_value = NULL;
 	if (security == MODEST_PROTOCOL_CONNECTION_NORMAL)
 		str_value = MODEST_ACCOUNT_SECURITY_VALUE_NONE;
-	else if (security == MODEST_PROTOCOL_CONNECTION_TLS)
+	else if (security == MODEST_PROTOCOL_CONNECTION_TLS) {
+		/* The UI has "Normal (TLS)": */
 		str_value = MODEST_ACCOUNT_SECURITY_VALUE_NORMAL;
-	else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
+	} else if (security == MODEST_PROTOCOL_CONNECTION_SSL)
 		str_value = MODEST_ACCOUNT_SECURITY_VALUE_SSL;
 	
 	/* Set it in the configuration: */
@@ -505,15 +527,8 @@ 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 (!modest_account_mgr_account_exists (self, account, FALSE)) {
+	if (account && !modest_account_mgr_account_exists (self, account, FALSE)) {
 		g_printerr ("modest: default account does not exist\n");
 		g_free (account);
 		return NULL;
@@ -534,7 +549,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);
 
@@ -563,20 +578,23 @@ modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
 {
 	gboolean result = FALSE;
 	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)
-	{
+	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);
 	}
-	
-	/* TODO: Free the strings too? */
-	g_slist_free (account_names);
-	
+
+	modest_account_mgr_free_account_names (account_names);
+	account_names = NULL;
+
 	return result;
 }