X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=24417113736bbaa64478851817048fc5fc98102d;hp=87f6921cf894876591e14786a83631af27cfa74c;hb=36766024c32c96dfa0d6b5595dcdd6fae9ff1162;hpb=d73789ffb936127d7e0b2ddfb7bc60683df683c5

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 87f6921..2441711 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <modest-defs.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>
@@ -84,6 +85,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);
@@ -104,7 +108,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;
@@ -255,9 +259,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 +272,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)
@@ -402,7 +406,7 @@ modest_tny_folder_get_account (TnyFolder *folder)
  *
  * The code that uses the query is available in revision 3152.
  */
-gboolean 
+gboolean
 modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 					   const gchar *new_name,
 					   gboolean non_strict)
@@ -415,7 +419,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 
 	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, FALSE, &err);
@@ -423,19 +427,21 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 	/* Check names */
 	iter = tny_list_create_iterator (subfolders);
 	while (!tny_iterator_is_done (iter) && !has_name) {
-		
+
 		const gchar *name;
-		
+
 		folder = (TnyFolder*)tny_iterator_get_current (iter);
 		if (!folder || ! TNY_IS_FOLDER(folder)) {
 			g_warning ("%s: invalid folder", __FUNCTION__);
+			tny_iterator_next (iter);
 			continue;
 		}
-		
+
 		name = tny_folder_get_name (folder);
 		if (!name) {
 			g_warning ("%s: folder name == NULL", __FUNCTION__);
 			g_object_unref (folder);
+			tny_iterator_next (iter);
 			continue;
 		}
 
@@ -455,17 +461,15 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 		} else {
 			has_name = FALSE;
 		}
-		
+
 		g_object_unref (folder);
 		tny_iterator_next(iter);
 	}
-	
+
 	/* free */
-	if (iter != NULL)
-		g_object_unref (iter);
-	if (subfolders != NULL)
-		g_object_unref (subfolders);
-		
+	g_object_unref (iter);
+	g_object_unref (subfolders);
+
 	return has_name;
 }
 
@@ -489,3 +493,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;
+}