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

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 57a58e7..67d8532 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>
@@ -48,13 +49,9 @@
 #include <tny-merge-folder.h>
 #include <modest-debug.h>
 #include <string.h>
-#ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-file-system-info.h>
-#else
+#ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-file-system-info.h>
 #endif
-#endif
 
 /* we need these dummy functions, or tinymail will complain */
 static gchar *  get_pass_dummy     (TnyAccount *account, const gchar *prompt, gboolean *cancel);
@@ -119,7 +116,7 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	 * returning an empty list. murrayc. */	
 	tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, FALSE, &error);
 	if (error) {
-		g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message);
+		g_debug ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message);
 		g_error_free (error);
 		goto cleanup;
 	}
@@ -361,6 +358,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);
@@ -424,7 +422,7 @@ set_online_callback (TnyCamelAccount *account, gboolean canceled, GError *err, g
 				TNY_ACCOUNT (account), TNY_ALERT_TYPE_ERROR, FALSE, 
 				err);
 		}
-		g_warning ("err: %s", err->message);
+		g_debug ("err: %s", err->message);
 	}
 }
 
@@ -595,7 +593,7 @@ typedef struct
 
 
 
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
 /* Gets the memory card name: */
 static void 
 on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
@@ -605,7 +603,7 @@ on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
 	GetMmcAccountNameData *callback_data = (GetMmcAccountNameData*)data;
 
 	if (error) {
-		g_warning ("%s: error=%s", __FUNCTION__, error->message);
+		g_debug ("%s: error=%s", __FUNCTION__, error->message);
   	}
 	
 	TnyAccount *account = TNY_ACCOUNT (callback_data->account);
@@ -636,7 +634,7 @@ on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
 
 void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
 {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_PLATFORM_MAEMO
 	/* Just use the path for the single memory card,
 	 * rather than try to figure out the path to the specific card by 
 	 * looking at the maildir URI:
@@ -1024,12 +1022,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 {