* 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 14474d2..b691bae 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -125,20 +125,27 @@ modest_tny_folder_get_rules   (const TnyFolder *folder)
                case TNY_FOLDER_TYPE_INBOX:
                case TNY_FOLDER_TYPE_JUNK:
                case TNY_FOLDER_TYPE_TRASH:
-               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;