Replaced the protocol tag for incoming xfers

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 516a72a..5341ec7 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -2916,7 +2916,7 @@ on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
                        valid  = !modest_protocol_registry_protocol_type_has_tag 
                                (modest_runtime_get_protocol_registry (),
                                 protocol_type,
-                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
                }
                if (valid)
                        move_to_dialog_show_folders (dialog, selected);

diff --git a/src/modest-protocol-registry.c b/src/modest-protocol-registry.c
index 1746c75..9e89763 100644 (file)
--- a/src/modest-protocol-registry.c
+++ b/src/modest-protocol-registry.c
@@ -463,7 +463,7 @@ modest_protocol_registry_set_to_default (ModestProtocolRegistry *self)
                                      MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS,
                                      MODEST_PROTOCOL_REGISTRY_REMOTE_STORE_PROTOCOLS,
                                      MODEST_PROTOCOL_REGISTRY_HAS_LEAVE_ON_SERVER_PROTOCOLS,
-                                     MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD,
+                                     MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS,
                                      NULL);
        g_object_unref (protocol);
 

diff --git a/src/modest-protocol-registry.h b/src/modest-protocol-registry.h
index 30aea7d..f28fe30 100644 (file)
--- a/src/modest-protocol-registry.h
+++ b/src/modest-protocol-registry.h
@@ -53,7 +53,8 @@ G_BEGIN_DECLS
 #define MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS "multi-mailbox-providers"
 #define MODEST_PROTOCOL_REGISTRY_USE_ALTERNATE_PORT "use-alternate-port"
 #define MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS "store-has-folders"
-#define MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD "store-forbid-message-add"
+/* Accounts that cannot be the destination of messages or folders transfers */
+#define MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS "store-forbid-incoming-xfers"
 #define MODEST_PROTOCOL_REGISTRY_NO_AUTO_UPDATE_PROTOCOLS "no-auto-update"
 
 /* convenience macros */

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 0cf7d02..c4ed79a 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -5745,7 +5745,7 @@ xfer_messages_performer  (gboolean canceled,
        /* tinymail will return NULL for local folders it seems */
        dst_forbids_message_add = modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
                                                                                  modest_tny_account_get_protocol_type (dst_account),
-                                                                                 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+                                                                                 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
        g_object_unref (dst_account);
 
        if (dst_forbids_message_add) {

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 398342d..56d29b8 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -2117,10 +2117,10 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                        ModestProtocolType protocol_type;
 
                        protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance));
-                       retval  = !modest_protocol_registry_protocol_type_has_tag 
+                       retval  = !modest_protocol_registry_protocol_type_has_tag
                                (modest_runtime_get_protocol_registry (),
                                 protocol_type,
-                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
                }
        }