X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-mgr-helpers.c;h=9ff28f37ead617a7dd54d81dd9c00ba528141942;hp=48c39a13c355da58e4c95a2755a3fe15ca4e06cd;hb=305b5f8ec558ffedb3b531618b7877cf8ee722b6;hpb=a2f971fd9378912d99ca8ce97c514bba81a3c4e2

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 48c39a1..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: */
@@ -511,8 +512,9 @@ modest_account_mgr_free_server_account_data (ModestAccountMgr *self,
 
 /** You must use modest_account_mgr_free_account_data() on the result.
  */
-ModestAccountData*
-modest_account_mgr_get_account_data     (ModestAccountMgr *self, const gchar* name)
+ModestAccountData *
+modest_account_mgr_get_account_data (ModestAccountMgr *self, 
+				     const gchar* name)
 {
 	ModestAccountData *data;
 	gchar *server_account;
@@ -883,9 +885,9 @@ modest_account_mgr_set_retrieve_type (ModestAccountMgr *self,
 
 
 void
-modest_account_mgr_set_server_account_user_fullname (ModestAccountMgr *self, 
-						     const gchar *account_name,
-						     const gchar *fullname)
+modest_account_mgr_set_user_fullname (ModestAccountMgr *self, 
+				      const gchar *account_name,
+				      const gchar *fullname)
 {
 	modest_account_mgr_set_string (self, 
 				       account_name,
@@ -895,9 +897,9 @@ modest_account_mgr_set_server_account_user_fullname (ModestAccountMgr *self,
 }
 
 void
-modest_account_mgr_set_server_account_user_email (ModestAccountMgr *self, 
-						  const gchar *account_name,
-						  const gchar *email)
+modest_account_mgr_set_user_email (ModestAccountMgr *self, 
+				   const gchar *account_name,
+				   const gchar *email)
 {
 	modest_account_mgr_set_string (self, 
 				       account_name,