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

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 5de9195..441dbff 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -240,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
@@ -248,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*
@@ -324,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;
 	}
 	
@@ -357,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: */
@@ -525,13 +527,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");
@@ -554,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);
 
@@ -583,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;
 }