* Reverted the two new folder rules, both are NON_WRITABLE

pmo-trunk-r1958

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 54955b6..760a3df 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -977,11 +977,11 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE) {
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-                            _("FIXME: unable to transfer folder"));
+                            _("mail_in_ui_folder_move_target_error"));
 
                /* Notify the queue */
                modest_mail_operation_notify_end (self);
-       } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_FOLDERS) {
+       } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: parent folder does not accept new folders"));
@@ -1502,7 +1502,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
 
        /* Apply folder rules */
-       if (rules & MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_MSGS) {
+       if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: folder does not accept msgs"));

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 098c33c..b691bae 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -120,17 +120,23 @@ modest_tny_folder_get_rules   (const TnyFolder *folder)
                switch (type) {
                case TNY_FOLDER_TYPE_DRAFTS:
                case TNY_FOLDER_TYPE_OUTBOX:
-                       rules |= MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_FOLDERS;
-                       rules |= MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_MSGS;
                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:
-               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 {
                ModestTransportStoreProtocol proto;

diff --git a/src/modest-tny-folder.h b/src/modest-tny-folder.h
index fb08ebc..f682205 100644 (file)
--- a/src/modest-tny-folder.h
+++ b/src/modest-tny-folder.h
@@ -40,12 +40,10 @@
 G_BEGIN_DECLS
 
 typedef enum {
-       MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE       = 1 << 1,
-       MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE       = 1 << 2,
-       MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE        = 1 << 3,
-       MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE      = 1 << 4,
-       MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_FOLDERS = 1 << 5,
-       MODEST_FOLDER_RULES_FOLDER_DONT_ACCEPT_MSGS    = 1 << 6
+       MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE  = 1 << 1,
+       MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE  = 1 << 2,
+       MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE   = 1 << 3,
+       MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE = 1 << 4,
 } ModestTnyFolderRules;
 
 /**