X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=31eab5a0585cd4b1e431969e978c35b24dae9c09;hb=dbdd198e6a3f3190425ce030e4d7dbf26195398d;hp=57a58e7c4817cb475808c838c3772fa4af758cc7;hpb=a279e17c3a6251f4e4e87c61c51e7ee20b875507;p=modest

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 57a58e7..31eab5a 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -28,6 +28,7 @@
  */
 
 #include <modest-platform.h>
+#include <modest-defs.h>
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>
@@ -361,6 +362,7 @@ modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
 		ModestProtocol *protocol;
 		const gchar* proto_name = NULL;
 		tny_account_set_id (tny_account, server_account_name);
+		tny_account_set_name (tny_account, server_account_name);
 		tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
 		protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, modest_server_account_settings_get_protocol (server_settings));
 		proto_name = modest_protocol_get_name (protocol);
@@ -1024,12 +1026,20 @@ modest_tny_folder_store_is_remote (TnyFolderStore *folder_store)
 
         if (account != NULL) {
                 if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
-                        if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) &&
-                            !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) {
-                                /* This must be a maildir account, which does
-                                 * not require a connection: */
-                                result = FALSE;
-                        }
+			ModestProtocolType proto_type;
+			const gchar *tag;
+			ModestProtocolRegistry *registry;
+
+			proto_type = modest_tny_account_get_protocol_type (account);
+			registry = modest_runtime_get_protocol_registry ();
+			tag = MODEST_PROTOCOL_REGISTRY_REMOTE_STORE_PROTOCOLS;
+			if (modest_protocol_registry_protocol_type_has_tag (registry, 
+									    proto_type,
+									    tag)) {
+				result = TRUE;
+			} else {
+				result = FALSE;
+			}
                 }
                 g_object_unref (account);
         } else {