* 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 ff32e0e..915c787 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -38,6 +38,7 @@
 #include <modest-protocol-info.h>
 #include <modest-runtime.h>
 #include <modest-tny-account-store.h>
+#include <modest-text-utils.h>
 
 
 /* make sure you use the *full* name, because foo/drafts is not the same as drafts */
@@ -57,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));
        
@@ -230,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. 
@@ -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(), 
@@ -376,30 +381,58 @@ modest_tny_folder_get_account (TnyFolder *folder)
  */
 gboolean 
 modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
-                                          const gchar *new_name)
+                                          const gchar *new_name,
+                                          gboolean non_strict)
 {
        TnyList *subfolders = NULL;
        TnyIterator *iter = NULL;
        TnyFolder *folder = NULL;
        GError *err = NULL;
-       gboolean same_subfolder = FALSE;
+       gboolean has_name = FALSE;
 
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), FALSE);
-
+       g_return_val_if_fail (new_name, FALSE);
+       
        /* Get direct subfolders */
        subfolders = tny_simple_list_new ();
        tny_folder_store_get_folders (parent, subfolders, NULL, &err);
 
        /* Check names */
        iter = tny_list_create_iterator (subfolders);
-       while (!tny_iterator_is_done (iter) && !same_subfolder) {
-               const gchar *name = NULL;
-
-               folder = TNY_FOLDER(tny_iterator_get_current (iter));
-               name = tny_folder_get_name (folder);
+       while (!tny_iterator_is_done (iter) && !has_name) {
+               
+               const gchar *name;
                
-               same_subfolder = !strcmp(name, new_name);
+               folder = (TnyFolder*)tny_iterator_get_current (iter);
+               if (!folder || ! TNY_IS_FOLDER(folder)) {
+                       g_warning ("%s: invalid folder", __FUNCTION__);
+                       continue;
+               }
+               
+               name = tny_folder_get_name (folder);
+               if (!name) {
+                       g_warning ("%s: folder name == NULL", __FUNCTION__);
+                       g_object_unref (folder);
+                       continue;
+               }
 
+               /* is it simply the same folder name? */
+               if (strcmp (name, new_name) == 0)
+                       has_name = TRUE;
+               /* or is it the same when ignoring case (non-strict mode)? */
+               else if (non_strict && modest_text_utils_utf8_strcmp (name, new_name, TRUE) == 0)
+                       has_name = TRUE;
+               /* or is the name equal to the display name of some folder, in the current locale? */
+               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 = FALSE;
+               }
+               
                g_object_unref (folder);
                tny_iterator_next(iter);
        }
@@ -410,7 +443,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
        if (subfolders != NULL)
                g_object_unref (subfolders);
                
-       return same_subfolder;
+       return has_name;
 }
 
 gboolean