X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=9ff28f37ead617a7dd54d81dd9c00ba528141942;hb=f437bc152701d9a9b7cb75988ef04b30bbb0c8b4;hp=6cc12824c0ecca7918bc98cff8175f65c22b6d74;hpb=c7758f8aba3886a826b045e773986268bdf008b1;p=modest

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 6cc1282..9ff28f3 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -107,11 +107,11 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
 		result = FALSE;
 	} else {	
 		/* The server account is in the item after the connection name: */
-		GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
-		list_connection = g_slist_append (list_connection, (gpointer)server_account_name);
+		list = g_slist_append (list, (gpointer)connection_name);
+		list = g_slist_append (list, (gpointer)server_account_name);
 	
 		/* Reset the changed list: */
-		modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list_connection,
+		modest_conf_set_list (conf, MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, list,
 						    MODEST_CONF_VALUE_STRING, &err);
 		if (err) {
 			g_printerr ("modest: %s: error setting list: %s.\n", __FUNCTION__, err->message);
@@ -159,9 +159,10 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
 	/* 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 *account_node = g_slist_next (list_connection);
 		/* remove both items: */
-		GSList *temp = g_slist_delete_link(list_connection, list_connection);
-		temp = g_slist_delete_link(temp, g_slist_next(temp));
+		list = g_slist_delete_link(list, list_connection);
+		list = g_slist_delete_link(list, account_node);
 	}
 	
 	/* Reset the changed list: */