X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=94e18a5f8daf73647828ca0c87556106408f7cf7;hb=fc96f72a62af755e7832031864cb935270706023;hp=fc30538521c742162c351893e6a5413489b06f1f;hpb=8cb5d470d68036f3fc73156897144bafb83c78ef;p=modest

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index fc30538..94e18a5 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -81,6 +81,7 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	}
 	g_object_unref (G_OBJECT (folders));
 	g_object_unref (G_OBJECT (iter));
+	g_object_unref (G_OBJECT (local_account));
 
 	return special_folder;
 }
@@ -220,6 +221,9 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
 	if (account_data->display_name)
 		tny_account_set_name (tny_account, account_data->display_name); 
 
+	g_object_set_data_full (G_OBJECT(tny_account), "modest_account",
+				(gpointer*) g_strdup (account_name), g_free);
+	
 	modest_account_mgr_free_account_data (account_mgr, account_data);
 	return tny_account;
 }
@@ -244,14 +248,20 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 	maildir = modest_local_folder_info_get_maildir_path ();
 	url = camel_url_new ("maildir:", NULL);
 	camel_url_set_path (url, maildir);
+	/* Needed by tinymail's DBC assertions */
+ 	camel_url_set_host (url, "localhost");
 	url_string = camel_url_to_string (url, 0);
 	
 	tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-	tny_account_set_name (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_NAME); 
+
+	tny_account_set_name (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME); 
 	tny_account_set_id (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID); 
         tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
 	tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy);
-
+	
+	g_object_set_data (G_OBJECT(tny_account), "modest_account",
+			   (gpointer*)MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
+	
 	camel_url_free (url);
 	g_free (maildir);
 	g_free (url_string);
@@ -259,4 +269,3 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 	return TNY_ACCOUNT(tny_account);
 }
 
-