Improve archive folder detection

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

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 62149cb..f01c61d 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -84,6 +84,9 @@ modest_tny_folder_guess_folder_type (TnyFolder *folder)
                                if ((strlen (downcase) == 5) &&
                                    !strncmp (downcase, "inbox", 5))
                                        type = TNY_FOLDER_TYPE_INBOX;
+                               if ((strlen (downcase) == 7) &&
+                                   !strncmp (downcase, "archive", 7))
+                                       type = TNY_FOLDER_TYPE_ARCHIVE;
                                g_free (downcase);
                        }
                        g_object_unref (parent);
@@ -255,9 +258,9 @@ gboolean
 modest_tny_folder_is_memory_card_folder   (TnyFolder *folder)
 {
        g_return_val_if_fail (folder, FALSE);
-       
-       /* The merge folder is a special case, 
-        * used to merge the per-account local outbox folders. 
+
+       /* The merge folder is a special case,
+        * used to merge the per-account local outbox folders.
         * and can have no get_account() implementation.
         */
        if (TNY_IS_MERGE_FOLDER (folder))
@@ -268,15 +271,15 @@ 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 (account);
-       
+
        return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
-}      
+}
 
 gboolean
 modest_tny_folder_is_remote_folder   (TnyFolder *folder)
@@ -489,3 +492,38 @@ modest_tny_folder_is_ancestor (TnyFolder *folder,
        }
        return found;
 }
+
+gchar * 
+modest_tny_folder_get_display_name (TnyFolder *folder)
+{
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+       gchar *fname;
+
+       g_return_val_if_fail (TNY_IS_FOLDER (folder), NULL);
+
+       fname = g_strdup (tny_folder_get_name (folder));
+       type = tny_folder_get_folder_type (folder);
+
+       if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder)) ||
+           modest_tny_folder_is_memory_card_folder (TNY_FOLDER (folder))) {
+               type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (folder));
+               if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+                       g_free (fname);
+                               fname = g_strdup (modest_local_folder_info_get_type_display_name (type));
+               }
+       } else {
+               /* Sometimes an special folder is reported by the server as
+                  NORMAL, like some versions of Dovecot */
+               if (type == TNY_FOLDER_TYPE_NORMAL ||
+                   type == TNY_FOLDER_TYPE_UNKNOWN) {
+                       type = modest_tny_folder_guess_folder_type (TNY_FOLDER (folder));
+               }
+       }
+
+       if (type == TNY_FOLDER_TYPE_INBOX) {
+               g_free (fname);
+               fname = g_strdup (_("mcen_me_folder_inbox"));
+       }
+
+       return fname;
+}