2007-04-06 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-tny-account.c

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index cd653c6..94e18a5 100644 (file)
--- 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;
 }
@@ -221,7 +222,7 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
                tny_account_set_name (tny_account, account_data->display_name); 
 
        g_object_set_data_full (G_OBJECT(tny_account), "modest_account",
-                               (gpointer*)account_name, g_free);
+                               (gpointer*) g_strdup (account_name), g_free);
        
        modest_account_mgr_free_account_data (account_mgr, account_data);
        return tny_account;
@@ -247,6 +248,8 @@ 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);