* Reverted the two new folder rules, both are NON_WRITABLE

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

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index c292e25..b691bae 100644 (file)
--- 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,32 @@ 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:
+               case TNY_FOLDER_TYPE_ROOT:
+               case TNY_FOLDER_TYPE_NOTES:
+               case TNY_FOLDER_TYPE_CONTACTS:
+               case TNY_FOLDER_TYPE_CALENDAR:
+               case TNY_FOLDER_TYPE_ARCHIVE:
+               case TNY_FOLDER_TYPE_MERGE:
+               case TNY_FOLDER_TYPE_NUM:
                        rules |= MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE;
                        rules |= MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
                        rules |= MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE;
+               default:
+                       break;
                }
        } 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 +168,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 +176,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);
 }      
 
 
@@ -185,15 +196,19 @@ modest_tny_folder_get_local_folder_type  (const TnyFolder *folder)
        g_return_val_if_fail (modest_tny_folder_is_local_folder(folder),
                              TNY_FOLDER_TYPE_UNKNOWN);
 
+       /* we need to use the camel functions, because we want the
+        * _full name_, that is, the full path name of the folder,
+        * to distinguis between 'Outbox' and 'myfunkyfolder/Outbox'
+        */
        camel_folder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER(folder));
        if (!camel_folder)
                return TNY_FOLDER_TYPE_UNKNOWN;
 
        full_name = camel_folder_get_full_name (camel_folder);
-       if (!full_name)
-               return TNY_FOLDER_TYPE_UNKNOWN;
-
        camel_object_unref (CAMEL_OBJECT(camel_folder));
-
-       return modest_local_folder_info_get_type (full_name);
+       
+       if (!full_name) 
+               return TNY_FOLDER_TYPE_UNKNOWN;
+       else 
+               return modest_local_folder_info_get_type (full_name);
 }