X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=10e77e55b9c5a496c90781d6513d2977340d2b49;hb=bac5b9ce2f6d579d6d4bb0969c97537300cfc1c8;hp=15c7d0ad2806800b099aeeabe98ace3b7689b344;hpb=ce6ffa222c658f6055cc0250bf0927ccfbbd4a9e;p=modest

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 15c7d0a..10e77e5 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -47,10 +47,12 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name)
 	folder = g_utf8_strdown (name, strlen(name));
 
 	if (strcmp (folder, "inbox") == 0 ||
-	    strcmp (folder, _("inbox")) == 0)
+	    strcmp (folder, _("inbox")) == 0 ||
+	    strcmp (folder, _("mcen_me_folder_inbox")) == 0)
 		type = TNY_FOLDER_TYPE_INBOX;
 	else if (strcmp (folder, "outbox") == 0 ||
-		 strcmp (folder, _("outbox")) == 0)
+		 strcmp (folder, _("outbox")) == 0 ||
+		 strcmp (folder, _("mcen_me_folder_outbox")) == 0)
 		type = TNY_FOLDER_TYPE_OUTBOX;
 	else if (g_str_has_prefix(folder, "junk") ||
 		 g_str_has_prefix(folder, _("junk")))
@@ -59,10 +61,12 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name)
 		 g_str_has_prefix(folder, _("trash")))
 		type = TNY_FOLDER_TYPE_TRASH;
 	else if (g_str_has_prefix(folder, "sent") ||
-		 g_str_has_prefix(folder, _("sent")))
+		 g_str_has_prefix(folder, _("sent")) ||
+		 strcmp (folder, _("mcen_me_folder_sent")) == 0)
 		type = TNY_FOLDER_TYPE_SENT;
 	else if (g_str_has_prefix(folder, "draft") ||
-		 g_str_has_prefix(folder, _("draft")))
+		 g_str_has_prefix(folder, _("draft")) ||
+		 strcmp (folder, _("mcen_me_folder_drafts")) == 0)
 		type = TNY_FOLDER_TYPE_DRAFTS;
 	else if (g_str_has_prefix(folder, "notes") ||
 		 g_str_has_prefix(folder, _("notes")))
@@ -102,7 +106,7 @@ modest_tny_folder_guess_folder_type (const TnyFolder *folder)
 
 /* FIXME: encode all folder rules here */
 ModestTnyFolderRules
-modest_tny_folder_get_folder_rules   (const TnyFolder *folder)
+modest_tny_folder_get_rules   (const TnyFolder *folder)
 {
 	ModestTnyFolderRules rules = 0;
 	TnyFolderType type;
@@ -116,25 +120,24 @@ modest_tny_folder_get_folder_rules   (const TnyFolder *folder)
 		switch (type) {
 		case TNY_FOLDER_TYPE_DRAFTS:
 		case TNY_FOLDER_TYPE_OUTBOX:
+		case TNY_FOLDER_TYPE_SENT:
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
 		case TNY_FOLDER_TYPE_INBOX:
 		case TNY_FOLDER_TYPE_JUNK:
 		case TNY_FOLDER_TYPE_TRASH:
-		case TNY_FOLDER_TYPE_SENT:
 		default:
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE;
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE;
 		}
 	} else {
-		ModestProtocol proto;
+		ModestTransportStoreProtocol proto;
 		TnyAccount *account =
 			tny_folder_get_account ((TnyFolder*)folder);
 		if (!account)
 			return -1; /* no account: nothing is allowed */
 		
-		proto = modest_protocol_info_get_protocol (
-			tny_account_get_proto (account));
+		proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
 
 		if (proto == MODEST_PROTOCOL_STORE_IMAP) {
 			rules = 0;
@@ -157,7 +160,7 @@ gboolean
 modest_tny_folder_is_local_folder   (const TnyFolder *folder)
 {
 	TnyAccount*  account;
-	const gchar* account_name;
+	const gchar* account_id;
 	
 	g_return_val_if_fail (folder, FALSE);
 	
@@ -165,13 +168,13 @@ modest_tny_folder_is_local_folder   (const TnyFolder *folder)
 	if (!account)
 		return FALSE;
 
-	account_name = tny_account_get_id (account);
-	if (!account_name)
+	account_id = tny_account_get_id (account);
+	if (!account_id)
 		return FALSE;
 
 	g_object_unref (G_OBJECT(account));
 	
-	return (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0);
+	return (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0);
 }