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

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 47a343c..5de9195 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -85,7 +85,7 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
 	
 	GSList *list = modest_account_mgr_get_list (self, account_name, 
 							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-						    MODEST_CONF_VALUE_STRING, TRUE);
+						    MODEST_CONF_VALUE_STRING, FALSE);
 		
 	/* The server account is in the item after the connection name: */
 	GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
@@ -93,8 +93,8 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
 	
 	/* Reset the changed list: */
 	modest_account_mgr_set_list (self, account_name, 
-							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
-						    MODEST_CONF_VALUE_STRING, TRUE);
+							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
+						    MODEST_CONF_VALUE_STRING, FALSE);
 				
 	/* TODO: Should we free the items too, or just the list? */
 	g_slist_free (list);
@@ -117,7 +117,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 {
 	GSList *list = modest_account_mgr_get_list (self, account_name, 
 							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-						    MODEST_CONF_VALUE_STRING, TRUE);
+						    MODEST_CONF_VALUE_STRING, FALSE);
 	if (!list)
 		return FALSE;
 		
@@ -132,7 +132,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 	/* Reset the changed list: */
 	modest_account_mgr_set_list (self, account_name, 
 							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST, list,
-						    MODEST_CONF_VALUE_STRING, TRUE);
+						    MODEST_CONF_VALUE_STRING, FALSE);
 				
 	/* TODO: Should we free the items too, or just the list? */
 	g_slist_free (list);
@@ -140,6 +140,20 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 	return TRUE;
 }
 
+gboolean modest_account_mgr_get_has_connection_specific_smtp (ModestAccountMgr *self, const gchar* account_name)
+{
+	GSList *list = modest_account_mgr_get_list (self, account_name, 
+							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+						    MODEST_CONF_VALUE_STRING, FALSE);
+	if (!list)
+		return FALSE;
+	
+	/* TODO: Should we free the items too, or just the list? */
+	g_slist_free (list);
+	
+	return TRUE;
+}
+
 /**
  * modest_account_mgr_get_connection_specific_smtp
  * @self: a ModestAccountMgr instance
@@ -157,17 +171,37 @@ gchar* modest_account_mgr_get_connection_specific_smtp (ModestAccountMgr *self,
 	
 	GSList *list = modest_account_mgr_get_list (self, account_name, 
 							MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
-						    MODEST_CONF_VALUE_STRING, TRUE);
+						    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);
@@ -499,7 +533,7 @@ modest_account_mgr_get_default_account  (ModestAccountMgr *self)
 	}
 
 	/* 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;