* Fixes NB#91689. fixes a wrong check for ASCII

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

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index e8d37da..62149cb 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -31,11 +31,11 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <modest-tny-folder.h>
+#include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>
 #include <tny-simple-list.h>
 #include <tny-camel-folder.h>
 #include <tny-merge-folder.h>
-#include <modest-protocol-info.h>
 #include <modest-runtime.h>
 #include <modest-tny-account-store.h>
 #include <modest-text-utils.h>
@@ -69,6 +69,26 @@ modest_tny_folder_guess_folder_type (TnyFolder *folder)
                type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
        else
                type = tny_folder_get_folder_type (TNY_FOLDER (folder));
+
+       /* Fallback code, some servers (Dovecot in some versions)
+          report incorrectly that the INBOX folder is a normal
+          folder. Really ugly code but... */
+       if (type == TNY_FOLDER_TYPE_NORMAL) {
+               TnyFolderStore *parent = tny_folder_get_folder_store (folder);
+               if (parent) {
+                       if (TNY_IS_ACCOUNT (parent)) {
+                               gchar *downcase = 
+                                       g_ascii_strdown (tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder)), 
+                                                        -1);
+
+                               if ((strlen (downcase) == 5) &&
+                                   !strncmp (downcase, "inbox", 5))
+                                       type = TNY_FOLDER_TYPE_INBOX;
+                               g_free (downcase);
+                       }
+                       g_object_unref (parent);
+               }
+       }
        
        if (type == TNY_FOLDER_TYPE_UNKNOWN) {
                const gchar *folder_name =
@@ -84,7 +104,7 @@ modest_tny_folder_guess_folder_type (TnyFolder *folder)
 
 
 const gchar*
-modest_tny_folder_get_help_id (const TnyFolder *folder)
+modest_tny_folder_get_help_id (TnyFolder *folder)
 {
        TnyFolderType type;
        const gchar* help_id = NULL;
@@ -148,17 +168,20 @@ modest_tny_folder_get_rules   (TnyFolder *folder)
                        break;
                }
        } else {
-               ModestTransportStoreProtocol proto;
+               ModestProtocolRegistry *protocol_registry;
+               ModestProtocolType protocol_type;
                TnyFolderType folder_type;
                TnyAccount *account;
 
+               protocol_registry = modest_runtime_get_protocol_registry ();
+
                account = modest_tny_folder_get_account ((TnyFolder*)folder);
                if (!account)
                        return -1; /* no account: nothing is allowed */
                
-               proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+               protocol_type = modest_tny_account_get_protocol_type (account);
 
-               if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+               if (modest_protocol_registry_protocol_type_has_tag (protocol_registry, protocol_type, MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS)) {
                        rules = 0;
                } else {
                        /* pop, nntp, ... */
@@ -245,10 +268,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);
 }      
@@ -328,7 +353,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 +362,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);
@@ -392,7 +418,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
        
        /* Get direct subfolders */
        subfolders = tny_simple_list_new ();
-       tny_folder_store_get_folders (parent, subfolders, NULL, &err);
+       tny_folder_store_get_folders (parent, subfolders, NULL, FALSE, &err);
 
        /* Check names */
        iter = tny_list_create_iterator (subfolders);