* Reverted changes for bug 85454 since it adds another bugs

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

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index d89b868..915c787 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -245,10 +245,12 @@ modest_tny_folder_is_memory_card_folder   (TnyFolder *folder)
                return FALSE;
 
        const gchar* account_id = tny_account_get_id (account);
-       if (!account_id)
+       if (!account_id) {      
+               g_object_unref (account);
                return FALSE;
+       }
 
-       g_object_unref (G_OBJECT(account));
+       g_object_unref (account);
        
        return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
 }      
@@ -258,7 +260,7 @@ modest_tny_folder_is_remote_folder   (TnyFolder *folder)
 {
        gboolean is_local = TRUE;
 
-       g_return_val_if_fail (folder, FALSE);
+       g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE);
        
        is_local = ((modest_tny_folder_is_local_folder(folder)) ||
                    (modest_tny_folder_is_memory_card_folder(folder)));
@@ -328,7 +330,7 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header)
 {
        TnyFolder *folder;
        gchar *url, *retval;
-       const gchar *uid;
+       gchar *uid;
 
        g_return_val_if_fail (TNY_IS_HEADER (header), NULL);
 
@@ -337,9 +339,10 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header)
                return NULL;
 
        url = tny_folder_get_url_string (folder);
-       uid = tny_header_get_uid (header);
+       uid = tny_header_dup_uid (header);
 
        retval = g_strjoin ("/", url, uid, NULL);
+       g_free (uid);
 
        g_free (url);
        g_object_unref (folder);
@@ -351,6 +354,8 @@ TnyAccount *
 modest_tny_folder_get_account (TnyFolder *folder)
 {
        TnyAccount *account = NULL;
+
+       g_return_val_if_fail (TNY_IS_FOLDER(folder), NULL);
        
        if (TNY_IS_MERGE_FOLDER (folder)) {
                /* TnyMergeFolder does not support get_account(),