Work to complete implementation of purge attachments operation

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index a2dee46..d93da11 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -244,6 +244,24 @@ account_list_free (GSList *accounts)
        g_slist_free (accounts);
 }
 
+
+
+/* disconnect the list of TnyAccounts */
+static void
+account_list_disconnect (GSList *accounts)
+{
+       GSList *cursor = accounts;
+
+       g_printerr ("modest: DEBUG disconnecting all accounts\n");
+       while (cursor) {
+               if (TNY_IS_CAMEL_ACCOUNT(cursor->data))  /* check twice... */
+                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(cursor->data), FALSE, NULL);
+               cursor = g_slist_next (cursor);
+       }
+}
+
+
+
 static void
 recreate_all_accounts (ModestTnyAccountStore *self)
 {
@@ -544,6 +562,10 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->device = NULL;
        }
 
+       /* disconnect all accounts when we are destroyed */
+       account_list_disconnect (priv->store_accounts);
+       account_list_disconnect (priv->transport_accounts);
+               
        /* this includes the local folder */
        account_list_free (priv->store_accounts);
        priv->store_accounts = NULL;
@@ -962,8 +984,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                 * specific dialog messages from Chapter 12 of the UI spec.
                 */
                case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: 
-/*                 g_debug ("%s: Handling GError domain=%d, code=%d, message=%s",  */
-/*                             __FUNCTION__, error->domain, error->code, error->message); */
+                       /* This debug output is useful. Please keep it uncommented until 
+                        * we have fixed the problems in this function: */
+                   g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", 
+                               __FUNCTION__, error->domain, error->code, error->message);
                        
                        /* TODO: Remove the internal error message for the real release.
                         * This is just so the testers can give us more information: */