2007-07-31 Philip Van Hoof <pvanhoof@gnome.org>
[modest] / src / modest-tny-account.c
index 0db9025..c718034 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <modest-platform.h>
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-runtime.h>
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-folder-stats.h>
 #include <string.h>
-
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-file-system-info.h>
+#else
+#include <hildon/hildon-file-system-info.h>
+#endif
 
 TnyFolder *
 modest_tny_account_get_special_folder (TnyAccount *account,
@@ -68,19 +74,29 @@ modest_tny_account_get_special_folder (TnyAccount *account,
        if (special_type == TNY_FOLDER_TYPE_OUTBOX) {
                const gchar *modest_account_name = 
                        modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-               g_assert (modest_account_name);
-
-               gchar *account_id = g_strdup_printf (
-                       MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
-                       modest_account_name);
                
-               local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
-                                                                       account_id);
-               g_free (account_id);
+               if (modest_account_name) {
+                       gchar *account_id = g_strdup_printf (
+                               MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
+                               modest_account_name);
+                       
+                       local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+                                                                                    MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+                                                                                    account_id);
+                       if (!local_account) {
+                               g_printerr ("modest: %s: modest_tny_account_store_get_tny_account_by(ID) returned NULL for %s\n", __FUNCTION__, account_id);
+                       return NULL;
+                       }
+               
+                       g_free (account_id);
+               } else {
+                       g_warning ("%s: modest_account_name was NULL.", __FUNCTION__);
+               }
        } else {
                /* Other local folders are all in one on-disk directory: */
-               local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
-                                                                               MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+               local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+                                                                            MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+                                                                            MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
        }
        
        if (!local_account) {
@@ -92,20 +108,36 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 
        /* There is no need to do this _async, as these are local folders. */
        /* TODO: However, this seems to fail sometimes when the network is busy, 
-        * returning an empty list. murrayc. */
+        * returning an empty list. murrayc. */ 
+       GError *error = NULL;
        tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account),
-                                     folders, NULL, NULL);
+                                     folders, NULL, &error);
+       if (error) {
+               g_warning ("%s: tny_folder_store_get_folders() failed:\n  error=%s\n", 
+                       __FUNCTION__, error->message);
+       }
+                                     
+       if (tny_list_get_length (folders) == 0) {
+               gchar* url_string = tny_account_get_url_string (local_account);
+               g_printerr ("modest: %s: tny_folder_store_get_folders() returned an empty list for account with URL '%s'\n", 
+                       __FUNCTION__, url_string);
+               g_free (url_string);
+       }
+       
        iter = tny_list_create_iterator (folders);
 
        while (!tny_iterator_is_done (iter)) {
                TnyFolder *folder =
                        TNY_FOLDER (tny_iterator_get_current (iter));
-               if (modest_tny_folder_get_local_folder_type (folder) == special_type) {
-                       special_folder = folder;
-                       break;
-               }
+               if (folder) {
+                       if (modest_tny_folder_get_local_or_mmc_folder_type (folder) == special_type) {
+                               special_folder = folder;
+                               break; /* Leaving a ref for the special_folder return value. */
+                       }
                
-               g_object_unref (G_OBJECT(folder));
+                       g_object_unref (G_OBJECT(folder));
+               }
+
                tny_iterator_next (iter);
        }
        
@@ -113,9 +145,59 @@ modest_tny_account_get_special_folder (TnyAccount *account,
        g_object_unref (G_OBJECT (iter));
        g_object_unref (G_OBJECT (local_account));
 
+       /*
+       if (!special_folder) {
+               g_warning ("%s: Returning NULL.", __FUNCTION__);        
+       }
+       */
+       
        return special_folder;
 }
 
+static void
+on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data)
+{
+       printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status);
+       
+       if (status == TNY_CONNECTION_STATUS_DISCONNECTED) {
+               /* A tinymail network operation failed, and tinymail then noticed that 
+                * the account is offline, because our TnyDevice is offline,
+                * because libconic says we are offline.
+                * So ask the user to go online again.
+                * 
+                * Note that this signal will not be emitted if the account was offline 
+                * when the network operation was first attempted. For those cases, 
+                * the application must do its own explicit checks.
+                *
+                * We make sure that this UI is shown in the main thread, to avoid races,
+                * because tinymail does not guarantee that this signal handler will be called 
+                * in the main thread.
+                */
+               /* TODO: Commented out, because this causes hangs, probably related to 
+                * our use of mainloops:
+                * modest_platform_connect_and_wait (NULL);
+                */
+       } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) {
+               printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", 
+                       __FUNCTION__);
+                       
+               /* Something went wrong during some network operation.
+                * Stop trying to use the network now,
+                * by forcing accounts into offline mode:
+                * 
+                * When libconic reconnects, it will set the device back online again,
+                * regardless of it being forced offline before.
+                */
+               /* TODO: Find out when this is falsely being emitted. */
+               printf ("  DEBUG: %s: Not forcing offline because tinymail is sometimes reporting false connection breaks.\n", 
+                       __FUNCTION__);
+               /*
+               TnyDevice *device = modest_runtime_get_device ();
+               tny_device_force_offline (device);
+               */
+       }
+}
+
 /* Camel options: */
 
 /* These seem to be listed in 
@@ -123,8 +205,14 @@ modest_tny_account_get_special_folder (TnyAccount *account,
  */
 #define MODEST_ACCOUNT_OPTION_SSL "use_ssl"
 #define MODEST_ACCOUNT_OPTION_SSL_NEVER "never"
-#define MODEST_ACCOUNT_OPTION_SSL_ALWAYS "always"
+/* This is a tinymail camel-lite specific option, 
+ * roughly equivalent to "always" in regular camel,
+ * which is appropriate for a generic "SSL" connection option: */
+#define MODEST_ACCOUNT_OPTION_SSL_WRAPPED "wrapped"
+/* Not used in our UI so far: */
 #define MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE "when-possible"
+/* This is a tinymailcamel-lite specific option that is not in regular camel. */
+#define MODEST_ACCOUNT_OPTION_SSL_TLS "tls"
 
 /* These seem to be listed in 
  * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-provider.c 
@@ -153,7 +241,8 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 /**
  * modest_tny_account_new_from_server_account:
  * @account_mgr: a valid account mgr instance
- * @account_name: the server account name for which to create a corresponding tny account
+ * @session: A valid TnySessionCamel instance.
+ * @account_data: the server account for which to create a corresponding tny account
  * @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT)
  * 
  * get a tnyaccount corresponding to the server_accounts (store or transport) for this account.
@@ -163,11 +252,13 @@ modest_tny_account_get_special_folder (TnyAccount *account,
  */
 static TnyAccount*
 modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
+                                           TnySessionCamel *session,
                                            ModestServerAccountData *account_data)
 {
        gchar *url = NULL;
 
        g_return_val_if_fail (account_mgr, NULL);
+       g_return_val_if_fail (session, NULL);
        g_return_val_if_fail (account_data, NULL);
 
        /* sanity checks */
@@ -203,6 +294,14 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
        }
        tny_account_set_id (tny_account, account_data->account_name);
 
+       /* This must be set quite early, or other set() functions will fail. */
+    tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
+    
+       /* Handle connection requests:
+        * This (badly-named) signal will be called when we try to use an offline account. */
+       g_signal_connect (G_OBJECT (tny_account), "connection-status-changed",
+                       G_CALLBACK (on_connection_status_changed), NULL);
+
        /* Proto */
        const gchar* proto_name =
                modest_protocol_info_get_transport_store_protocol_name(account_data->proto);
@@ -227,10 +326,15 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
                        option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_NEVER;
                        break;
                case MODEST_PROTOCOL_CONNECTION_SSL:
+                       /* Apparently, use of "IMAPS" (specified in our UI spec), implies 
+                        * use of the "wrapped" option: */
+                       option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WRAPPED;
+                       break;
                case MODEST_PROTOCOL_CONNECTION_TLS:
-                       option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_ALWAYS;;
+                       option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_TLS;
                        break;
                case MODEST_PROTOCOL_CONNECTION_TLS_OP:
+                       /* This is not actually in our UI: */
                        option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE;
                        break;
                default:
@@ -303,18 +407,22 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
                        tny_account_set_port (tny_account, account_data->port);
        }
 
-       /* FIXME: for debugging */
+       /* FIXME: for debugging. 
+        * Let's keep this because it is very useful for debugging. */
        url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
-/*     g_message ("modest: %s:\n  account-url: %s", __FUNCTION__, url); */
+
+       printf ("DEBUG %s:\n  account-url: %s\n", __FUNCTION__, url);
+
        g_free (url);
        /***********************/
-       
+
        return tny_account;
 }
 
 TnyAccount*
 modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
-                                           const gchar *server_account_name)
+                                               TnySessionCamel *session,
+                                               const gchar *server_account_name)
 {
        ModestServerAccountData *account_data = 
                modest_account_mgr_get_server_account_data (account_mgr, 
@@ -323,8 +431,8 @@ modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
                return NULL;
 
        TnyAccount *result = modest_tny_account_new_from_server_account (
-               account_mgr, account_data);
-               
+               account_mgr, session, account_data);
+
        modest_account_mgr_free_server_account_data (account_mgr, account_data);
        
        return result;
@@ -356,6 +464,7 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
 
        g_return_val_if_fail (account_mgr, NULL);
        g_return_val_if_fail (account_name, NULL);
+       g_return_val_if_fail (session, NULL);
 
        account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
        if (!account_data) {
@@ -375,56 +484,145 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
                return NULL;
        }
        
-       tny_account = modest_tny_account_new_from_server_account (account_mgr, server_data);
+       tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data);
        if (!tny_account) { 
                g_printerr ("modest: failed to create tny account for %s (%s)\n",
                            account_data->account_name, server_data->account_name);
                modest_account_mgr_free_account_data (account_mgr, account_data);
                return NULL;
        }
-       
-       tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
+
+
+       /* This name is what shows up in the folder view -- so for some POP/IMAP/... server
+        * account, we set its name to the account of which it is part. */
+       if (account_data->display_name)
+               tny_account_set_name (tny_account, account_data->display_name);
+
        tny_account_set_forget_pass_func (tny_account,
                                          forget_pass_func ? forget_pass_func : forget_pass_dummy);
        tny_account_set_pass_func (tny_account,
                                   get_pass_func ? get_pass_func: get_pass_dummy);
        
-       /* This name is what shows up in the folder view -- so for some POP/IMAP/... server
-        * account, we set its name to the account of which it is part. */
-       if (account_data->display_name)
-               tny_account_set_name (tny_account, account_data->display_name); 
 
-       modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name);
-       
-       modest_account_mgr_free_account_data (account_mgr, account_data);
+        modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name);
+
+        modest_account_mgr_free_account_data (account_mgr, account_data);
+
+/*
+        TnyAccountStore *astore = (TnyAccountStore *) modest_runtime_get_account_store ();
+        if (astore) {
+               TnyDevice *device = tny_account_store_get_device (astore);
+               GError *err = NULL;
+               g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)astore);
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (tny_account),
+                               tny_device_is_online (device), &err);
+               if (err) {
+                       g_print ("%s: tny_camel_account_set_online() failed: %s\n", __FUNCTION__, err->message);
+                       g_error_free (err);
+               }
+               g_object_unref (device);
+        } 
+*/
 
        return tny_account;
 }
 
-#if 0
+typedef struct
+{
+       TnyStoreAccount *account;
+       
+       ModestTnyAccountGetMmcAccountNameCallback callback;
+       gpointer user_data;
+} GetMmcAccountNameData;
+
+
+
+
+/* Gets the memory card name: */
 static void 
 on_modest_file_system_info(HildonFileSystemInfoHandle *handle,
-                           HildonFileSystemInfo *info,
-                           const GError *error, gpointer data)
+                             HildonFileSystemInfo *info,
+                             const GError *error, gpointer data)
 {
-       if (info) {
-               printf("DEBUG: %s: display name=%s\n", __FUNCTION__, 
-                       hildon_file_system_info_get_display_name(info));
-       }
-       else {
-               printf("DEBUG: %s: info is NULL.\n", __FUNCTION__);
+       GetMmcAccountNameData *callback_data = (GetMmcAccountNameData*)data;
+
+       if (error) {
+               g_warning ("%s: error=%s", __FUNCTION__, error->message);
+       }
+       
+       TnyAccount *account = TNY_ACCOUNT (callback_data->account);
+       
+       const gchar *previous_display_name = NULL;
+       
+       const gchar *display_name = NULL;
+       if (!error && info) {
+               display_name = hildon_file_system_info_get_display_name(info);
+               previous_display_name = tny_account_get_name (account);
        }
+                
+       /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__,  display_name); */
+       tny_account_set_name (account, display_name);
+               
+       /* Inform the application that the name is now ready: */
+       if (callback_data->callback)
+               (*(callback_data->callback)) (callback_data->account, 
+                       callback_data->user_data);
        
-       if (error) {
-               printf ("  DEBUG: error=%s\n", error->message);
+       g_object_unref (callback_data->account);
+       g_slice_free (GetMmcAccountNameData, callback_data);
+}
+
+void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
+{
+       /* Just use the hard-coded path for the single memory card,
+        * rather than try to figure out the path to the specific card by 
+        * looking at the maildir URI:
+        */
+       const gchar *uri_real = MODEST_MCC1_VOLUMEPATH_URI;
+
+       /*
+       gchar* uri = tny_account_get_url_string (TNY_ACCOUNT (self));
+       if (!uri)
+               return;
+
+       TODO: This gets the name of the folder, but we want the name of the volume.
+       gchar *uri_real = NULL;
+       const gchar* prefix = "maildir://localhost/";
+       if ((strstr (uri, prefix) == uri) && (strlen(uri) > strlen(prefix)) )
+               uri_real = g_strconcat ("file:///", uri + strlen (prefix), NULL);
+       */
+
+       if (uri_real) {
+               //This is freed in the callback:
+               GetMmcAccountNameData * callback_data = g_slice_new0(GetMmcAccountNameData);
+               callback_data->account = self;
+               g_object_ref (callback_data->account); /* Unrefed when we destroy the struct. */
+               callback_data->callback = callback;
+               callback_data->user_data = user_data;
+               
+               /* TODO: gnome_vfs_volume_get_display_name() does not return 
+                * the same string. But why not? Why does hildon needs its own 
+                * function for this?
+                */
+               /* printf ("DEBUG: %s Calling hildon_file_system_info_async_new() with URI=%s\n", __FUNCTION__, uri_real); */
+               hildon_file_system_info_async_new(uri_real, 
+                       on_modest_file_system_info, callback_data /* user_data */);
+
+               /* g_free (uri_real); */
        }
+
+       /* g_free (uri); */
 }
-#endif
 
+                               
 
 TnyAccount*
-modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
+modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session,
+                                         const gchar* location_filepath)
 {
+
+       
        /* Make sure that the directories exist: */
        modest_init_local_folders (location_filepath);
 
@@ -433,10 +631,22 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
        gchar *maildir, *url_string;
 
        g_return_val_if_fail (account_mgr, NULL);
+       g_return_val_if_fail (session, NULL);
+
        
-       tny_account = tny_camel_store_account_new ();
+       if (!location_filepath) {
+               /* A NULL filepath means that this is the special local-folders maildir 
+                * account: */
+               tny_account = TNY_STORE_ACCOUNT (modest_tny_local_folders_account_new ());
+       }
+       else {
+               /* Else, for instance, a per-account outbox maildir account: */
+               tny_account = TNY_STORE_ACCOUNT (tny_camel_store_account_new ());
+       }
+               
        if (!tny_account) {
-               g_printerr ("modest: cannot create account for local folders");
+               g_printerr ("modest: %s: cannot create account for local folders. filepath=%s", 
+                       __FUNCTION__, location_filepath);
                return NULL;
        }
        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
@@ -452,7 +662,7 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
        url_string = camel_url_to_string (url, 0);
        
        tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-       printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string);
+/*     printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string); */
 
        /* TODO: Use a more generic way of identifying memory card paths, 
         * and of marking accounts as memory card accounts, maybe
@@ -461,27 +671,43 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
                location_filepath && 
                (strcmp (location_filepath, MODEST_MCC1_VOLUMEPATH) == 0);
                
-       /* TODO: Use hildon_file_system_info_async_new() to get the display name? */
-#if 0
-       const gchar *uri = "file:///media/mmc1";
-       /* HildonFileSystemInfoHandle *async_handle = */
-       hildon_file_system_info_async_new(uri, 
-               on_modest_file_system_info, NULL /* user_data */);
-#endif
-
+       /* The name of memory card locations will be updated asynchronously.
+        * This is just a default: */
        const gchar *name = is_mmc ? _("Memory Card") : 
                MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME;
        tny_account_set_name (TNY_ACCOUNT(tny_account), name); 
        
+       /* Get the correct display name for memory cards, asynchronously: */
+       if (location_filepath) {
+               GError *error = NULL;
+               gchar *uri = g_filename_to_uri(location_filepath, NULL, &error);
+               if (error) {
+                       g_warning ("%s: g_filename_to_uri(%s) failed: %s", __FUNCTION__, 
+                               location_filepath, error->message);
+                       g_error_free (error);
+                       error = NULL;   
+               } else if (uri) {
+                       /* Get the account name asynchronously:
+                        * This might not happen soon enough, so some UI code might 
+                        * need to call this again, specifying a callback.
+                        */
+                       modest_tny_account_get_mmc_account_name (tny_account, NULL, NULL);
+                               
+                       g_free (uri);
+                       uri = NULL;
+               }
+       }
+       
+       
        const gchar* id = is_mmc ? MODEST_MMC_ACCOUNT_ID :
-               MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID;
-       tny_account_set_id (TNY_ACCOUNT(tny_account), id); 
+               MODEST_LOCAL_FOLDERS_ACCOUNT_ID;
+       tny_account_set_id (TNY_ACCOUNT(tny_account), id);
        
        tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
        tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy);
        
        modest_tny_account_set_parent_modest_account_name_for_server_account (
-               TNY_ACCOUNT (tny_account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+               TNY_ACCOUNT (tny_account), id);
        
        camel_url_free (url);
        g_free (maildir);
@@ -492,10 +718,13 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 
 
 TnyAccount*
-modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, const gchar* account_name, TnySessionCamel *session)
+modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr,
+                                                           const gchar* account_name,
+                                                           TnySessionCamel *session)
 {
        g_return_val_if_fail (account_mgr, NULL);
        g_return_val_if_fail (account_name, NULL);
+       g_return_val_if_fail (session, NULL);
        
        /* Notice that we create a ModestTnyOutboxAccount here, 
         * instead of just a TnyCamelStoreAccount,
@@ -530,7 +759,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
        camel_url_free (url);
        
        tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-       printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string);
+/*     printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string); */
        g_free (url_string);
 
        /* This text should never been seen,
@@ -549,7 +778,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
        
        /* Make this think that it belongs to the modest local-folders parent account: */
        modest_tny_account_set_parent_modest_account_name_for_server_account (
-               TNY_ACCOUNT (tny_account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+               TNY_ACCOUNT (tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
 
        return TNY_ACCOUNT(tny_account);
 }
@@ -557,9 +786,12 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 
 
 typedef gint (*TnyStatsFunc) (TnyFolderStats *stats);
+#define TASK_GET_ALL_COUNT     0
+#define TASK_GET_LOCAL_SIZE    1
+#define TASK_GET_FOLDER_COUNT  2
 
 typedef struct _RecurseFoldersHelper {
-       TnyStatsFunc function;
+       gint task;
        guint sum;
        guint folders;
 } RecurseFoldersHelper;
@@ -578,22 +810,22 @@ recurse_folders (TnyFolderStore *store,
        helper->folders += tny_list_get_length (folders);
 
        while (!tny_iterator_is_done (iter)) {
-               TnyFolderStats *stats;
                TnyFolder *folder;
 
                folder = TNY_FOLDER (tny_iterator_get_current (iter));
-               stats = tny_folder_get_stats (folder);
+               if (folder) {
+                       if (helper->task == TASK_GET_ALL_COUNT)
+                               helper->sum += tny_folder_get_all_count (folder);
 
-               /* initially, we sometimes get -1 from tinymail; ignore that */
-               if (helper->function && helper->function (stats) > 0)
-                       helper->sum += helper->function (stats);
+                       if (helper->task == TASK_GET_LOCAL_SIZE)
+                               helper->sum += tny_folder_get_local_size (folder);
 
-               if (TNY_IS_FOLDER_STORE (folder)) {
-                       recurse_folders (TNY_FOLDER_STORE (folder), query, helper);
+                       if (TNY_IS_FOLDER_STORE (folder))
+                               recurse_folders (TNY_FOLDER_STORE (folder), query, helper);
+
+                       g_object_unref (folder);
                }
-           
-               g_object_unref (folder);
-               g_object_unref (stats);
+
                tny_iterator_next (iter);
        }
         g_object_unref (G_OBJECT (iter));
@@ -610,7 +842,7 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self)
 
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->function = NULL;
+       helper->task = TASK_GET_FOLDER_COUNT;
        helper->sum = 0;
        helper->folders = 0;
 
@@ -633,7 +865,7 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self)
        
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->function = (TnyStatsFunc) tny_folder_stats_get_all_count;
+       helper->task = TASK_GET_ALL_COUNT;
        helper->sum = 0;
 
        recurse_folders (self, NULL, helper);
@@ -655,7 +887,7 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self)
 
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->function = (TnyStatsFunc) tny_folder_stats_get_local_size;
+       helper->task = TASK_GET_LOCAL_SIZE;
        helper->sum = 0;
 
        recurse_folders (self, NULL, helper);
@@ -667,15 +899,43 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self)
        return retval;
 }
 
-const gchar* modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self)
+const gchar* 
+modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self)
 {
        return (const gchar *)g_object_get_data (G_OBJECT (self), "modest_account");
 }
 
-void modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, const gchar* parent_modest_acount_name)
+void 
+modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, 
+                                                                     const gchar* parent_modest_acount_name)
 {
        g_object_set_data_full (G_OBJECT(self), "modest_account",
-                               (gpointer*) g_strdup (parent_modest_acount_name), g_free);
+                               (gpointer) g_strdup (parent_modest_acount_name), g_free);
+}
+
+gboolean
+modest_tny_account_is_virtual_local_folders (TnyAccount *self)
+{
+       /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount 
+        * for anything else. */
+       return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self);
 }
 
 
+gboolean
+modest_tny_account_is_memory_card_account (TnyAccount *self)
+{
+       const gchar* account_id = NULL;
+
+       g_return_val_if_fail (TNY_ACCOUNT (self), FALSE);
+
+       if (!self)
+               return FALSE;
+
+       account_id = tny_account_get_id (self);
+
+       if (!account_id)
+               return FALSE;
+       else    
+               return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
+}