X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=28012c3aa339791e0e708c7e373b723c254e1b97;hb=8347154ce87266bdbac7b7477fc0a9bbd70c96f3;hp=01763ec48da396cffd07b8b034e72c28664705e3;hpb=b70734073cfc2ac74c63fa8e299d97cab7df7962;p=modest

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 01763ec..28012c3 100644
--- 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>
@@ -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);
@@ -104,7 +107,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;
@@ -168,17 +171,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, ... */
@@ -252,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))
@@ -265,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)
@@ -415,7 +421,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);
@@ -426,6 +432,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 		folder = (TnyFolder*)tny_iterator_get_current (iter);
 		if (!folder || ! TNY_IS_FOLDER(folder)) {
 			g_warning ("%s: invalid folder", __FUNCTION__);
+			tny_iterator_next (iter);
 			continue;
 		}
 		
@@ -433,6 +440,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 		if (!name) {
 			g_warning ("%s: folder name == NULL", __FUNCTION__);
 			g_object_unref (folder);
+			tny_iterator_next (iter);
 			continue;
 		}
 
@@ -486,3 +494,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;
+}