* 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 725c0ec..915c787 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -58,14 +58,15 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* full_name)
 
 
 TnyFolderType
-modest_tny_folder_guess_folder_type (const TnyFolder *folder)
+modest_tny_folder_guess_folder_type (TnyFolder *folder)
 {
        TnyFolderType type;
        
        g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_INVALID);
 
-       if (modest_tny_folder_is_local_folder ((TnyFolder*)folder))
-               type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder);
+       if (modest_tny_folder_is_local_folder (folder) || 
+           modest_tny_folder_is_memory_card_folder (folder))
+               type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
        else
                type = tny_folder_get_folder_type (TNY_FOLDER (folder));
        
@@ -231,8 +232,6 @@ gboolean
 modest_tny_folder_is_memory_card_folder   (TnyFolder *folder)
 {
        g_return_val_if_fail (folder, FALSE);
-       g_return_val_if_fail (modest_tny_folder_guess_folder_type (folder) !=
-                             TNY_FOLDER_TYPE_INVALID, FALSE);
        
        /* The merge folder is a special case, 
         * used to merge the per-account local outbox folders. 
@@ -246,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);
 }      
@@ -259,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)));
@@ -329,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);
 
@@ -338,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);
@@ -352,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(), 
@@ -422,11 +426,12 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
                else if (non_strict) {
                        TnyFolderType type = modest_tny_folder_guess_folder_type (folder);
                        if (type != TNY_FOLDER_TYPE_INVALID && type != TNY_FOLDER_TYPE_NORMAL) 
-                               has_name =  modest_text_utils_utf8_strcmp (modest_local_folder_info_get_type_display_name (type),
-                                                                          new_name,
-                                                                          TRUE);
-               } else
+                               has_name = !(modest_text_utils_utf8_strcmp (modest_local_folder_info_get_type_display_name (type),
+                                                                           new_name,
+                                                                           TRUE));
+               } else {
                        has_name = FALSE;
+               }
                
                g_object_unref (folder);
                tny_iterator_next(iter);