Fixes RefNULL 11/14
[modest] / src / modest-tny-account-store.c
index a2716f9..d96e8e0 100644 (file)
 #include <tny-camel-transport-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
-
+#include "modest-text-utils.h"
 #include <modest-runtime.h>
 #include <modest-marshal.h>
-#include <modest-protocol-info.h>
+#include <modest-protocol-registry.h>
 #include <modest-local-folder-info.h>
+#include "modest-account-protocol.h"
 #include <modest-tny-account.h>
 #include <modest-tny-local-folders-account.h>
 #include <modest-account-mgr.h>
@@ -53,6 +54,7 @@
 #include <modest-signal-mgr.h>
 #include <modest-debug.h>
 
+#include <modest-defs.h>
 #include "modest-tny-account-store.h"
 #include "modest-tny-platform-factory.h"
 #include <tny-gtk-lockable.h>
@@ -110,11 +112,7 @@ static void    add_connection_specific_transport_accounts         (ModestTnyAcco
 
 static void    remove_connection_specific_transport_accounts      (ModestTnyAccountStore *self);
 
-static void    connection_status_changed   (TnyAccount *account, 
-                                           TnyConnectionStatus status, 
-                                           gpointer data);
-
-static gboolean only_local_accounts        (ModestTnyAccountStore *self);
+static inline gboolean only_local_accounts        (ModestTnyAccountStore *self);
 
 /* list my signals */
 enum {
@@ -130,7 +128,6 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
        gchar              *cache_dir;  
        GHashTable         *password_hash;
-       GHashTable         *account_settings_dialog_hash;
        ModestAccountMgr   *account_mgr;
        TnySessionCamel    *session;
        TnyDevice          *device;
@@ -144,6 +141,9 @@ struct _ModestTnyAccountStorePrivate {
        
        /* Matches transport accounts and outbox folder */
        GHashTable          *outbox_of_transport;
+
+       /* is sending mail blocked? */
+       gboolean send_mail_blocked;
 };
 
 #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -265,6 +265,7 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
        priv->session                = NULL;
        priv->device                 = NULL;
        priv->sighandlers            = NULL;
+       priv->send_mail_blocked      = FALSE;
        
        priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash,
                                                           g_direct_equal,
@@ -278,11 +279,6 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
        priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                     g_free, g_free);
 
-       /* A hash-map of modest account names to dialog pointers,
-        * so we can avoid showing the account settings twice for the same modest account: */                                 
-       priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, 
-                                                                   g_free, NULL);
-       
        /* Respond to volume mounts and unmounts, such 
         * as the insertion/removal of the memory card: */
        /* This is a singleton, so it does not need to be unrefed. */
@@ -335,8 +331,8 @@ add_mmc_account(ModestTnyAccountStore *self, gboolean emit_insert_signal)
        g_return_if_fail (priv->session);
        
        TnyAccount *mmc_account = modest_tny_account_new_for_local_folders (priv->account_mgr, 
-                                                                       priv->session, 
-                                                                       MODEST_MCC1_VOLUMEPATH);
+                                                                           priv->session, 
+                                                                           g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
 
        /* Add to the list of store accounts */
        tny_list_append (priv->store_accounts, G_OBJECT (mmc_account));
@@ -358,6 +354,7 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
 {
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
+       gchar *volume_path_uri;
  
        gchar *uri = NULL;
 
@@ -367,10 +364,14 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
        /* Check whether this was the external MMC1 card: */
        uri = gnome_vfs_volume_get_activation_uri (volume);
 
-       if (uri && (!strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI))) {
+       volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+                                      g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+                                      NULL);
+       if (uri && (!strcmp (uri, volume_path_uri))) {
                add_mmc_account (self, TRUE /* emit the insert signal. */);
        }
-       
+
+       g_free (volume_path_uri);       
        g_free (uri);
 }
 
@@ -382,13 +383,17 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        gchar *uri = NULL;
+       gchar *volume_path_uri;
 
        self = MODEST_TNY_ACCOUNT_STORE(user_data);
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
        /* Check whether this was the external MMC1 card: */
        uri = gnome_vfs_volume_get_activation_uri (volume);
-       if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) {
+       volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX,
+                                      g_getenv (MODEST_MMC1_VOLUMEPATH_ENV),
+                                      NULL);
+       if (uri && (strcmp (uri, volume_path_uri) == 0)) {
                TnyAccount *mmc_account = NULL;
                gboolean found = FALSE;
                TnyIterator *iter = NULL;
@@ -422,6 +427,7 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
                                   __FUNCTION__);
                }
        }
+       g_free (volume_path_uri);
        g_free (uri);
 }
 
@@ -460,7 +466,7 @@ on_account_changed (ModestAccountMgr *acc_mgr,
        account_list = (account_type == TNY_ACCOUNT_TYPE_STORE ? 
                        priv->store_accounts : 
                        priv->transport_accounts);
-       
+
        iter = tny_list_create_iterator (account_list);
        while (!tny_iterator_is_done (iter) && !found) {
                TnyAccount *tny_account;
@@ -475,50 +481,45 @@ on_account_changed (ModestAccountMgr *acc_mgr,
                }
                tny_iterator_next (iter);
        }
-
-       if (iter)
-               g_object_unref (iter);
-}
-
-static void 
-on_account_settings_hide (GtkWidget *widget, gpointer user_data)
-{
-       /* This is easier than using a struct for the user_data: */
-       ModestTnyAccountStore *self = modest_runtime_get_account_store();
-       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       gchar *account_name = (gchar *) user_data;
-       if (account_name)
-               g_hash_table_remove (priv->account_settings_dialog_hash, account_name);
+       g_object_unref (iter);
 }
 
 static void 
 show_password_warning_only (const gchar *msg)
 {
-       ModestWindow *main_window = 
-               modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */
-       
        /* Show an explanatory temporary banner: */
-       if (main_window) 
+       if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()))
                modest_platform_information_banner (NULL, NULL, msg);
 }
 
 static void 
 show_wrong_password_dialog (TnyAccount *account)
 { 
-       /* This is easier than using a struct for the user_data: */
-       ModestTnyAccountStore *self = modest_runtime_get_account_store();
-       GtkWidget *dialog = NULL;
-
        if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) {
                modest_ui_actions_on_smtp_servers (NULL, NULL);
        } else {
+               ModestAccountProtocol *proto;
+               ModestProtocolType proto_type;
                const gchar *modest_account_name;
-               modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);   
-               dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name);
+               modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+               /* Get proto */
+               proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+                                                                   modest_account_name);
+               proto = (ModestAccountProtocol *)
+                       modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), 
+                                                                      proto_type);
+
+               /* Create and show the dialog */
+               if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+                       ModestAccountSettingsDialog *dialog =
+                               modest_account_protocol_get_account_settings_dialog (proto, modest_account_name);
+                       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), NULL);
+                       gtk_widget_show (GTK_WIDGET (dialog));
+               }
        }
        /* Show an explanatory temporary banner: */
-       modest_platform_information_banner (dialog, NULL, _("mcen_ib_username_pw_incorrect"));
+       modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect"));
 }
 
 /* This callback will be called by Tinymail when it needs the password
@@ -574,10 +575,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                           __FUNCTION__, server_account_name ? server_account_name : "<NULL>");
                if (cancel)
                        *cancel = TRUE;
-               
+
                return NULL;
        }
-       
+
        /* This hash map stores passwords, including passwords that are not stored in gconf. */
        /* Is it in the hash? if it's already there, it must be wrong... */
        pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
@@ -590,7 +591,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
        MODEST_DEBUG_BLOCK(
                g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked);
        );
-               
+
        /* If the password is not already there, try ModestConf */
        if (!already_asked) {
                pwd  = modest_account_mgr_get_server_account_password (priv->account_mgr,
@@ -600,17 +601,21 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
 
        /* If it was already asked, it must have been wrong, so ask again */
        if (already_asked || !pwd || strlen(pwd) == 0) {
+               gboolean settings_have_password;
+               ModestProtocolType protocol_type;
+
                /* As per the UI spec, if no password was set in the account settings, 
                 * ask for it now. But if the password is wrong in the account settings, 
                 * then show a banner and the account settings dialog so it can be corrected:
                 */
-               ModestTransportStoreProtocol proto;
-               const gboolean settings_have_password = 
+               settings_have_password = 
                        modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
 
+               protocol_type = modest_tny_account_get_protocol_type (account);
+
                /* Show an error and after that ask for a password */
-               proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
-               if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) {
+               if (modest_protocol_registry_protocol_type_has_tag(modest_runtime_get_protocol_registry (), 
+                                                                  protocol_type, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS)) {
                        gchar *username = NULL, *msg = NULL;
                        username = modest_account_mgr_get_server_account_username (priv->account_mgr,
                                                                                   server_account_name);
@@ -622,7 +627,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                gchar *password;
                                password  = modest_account_mgr_get_server_account_password (priv->account_mgr,
                                                                                            server_account_name);
-                               if (!password || strlen(password) == 0)
+
+                               if (already_asked)
+                                       msg = g_strdup (_("mcen_ib_username_pw_incorrect"));
+                               else if (!password || strlen(password) == 0)
                                        msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), 
                                                               tny_account_get_name (account),
                                                               tny_account_get_hostname (account));
@@ -643,18 +651,18 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                if (settings_have_password) {
                        /* The password must be wrong, so show the account settings dialog so it can be corrected: */
                        show_wrong_password_dialog (account);
-                       
+
                        if (cancel)
                                *cancel = TRUE;
-                               
+
                        return NULL;
                }
-       
+
                /* we don't have it yet. Get the password from the user */
                const gchar* account_id = tny_account_get_id (account);
                gboolean remember = FALSE;
                pwd = NULL;
-               
+
                if (already_asked) {
                        const gchar *msg;
                        gboolean username_known = 
@@ -662,7 +670,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                                                                             server_account_name);
                        /* If the login has ever succeeded then show a specific message */
                        if (username_known)
-                               msg = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect");
+                               msg = _CS ("ecdg_ib_set_password_incorrect");
                        else
                                msg = _("mcen_ib_username_pw_incorrect");
                        show_password_warning_only (msg);
@@ -787,11 +795,6 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->password_hash = NULL;
        }
 
-       if (priv->account_settings_dialog_hash) {
-               g_hash_table_destroy (priv->account_settings_dialog_hash);
-               priv->account_settings_dialog_hash = NULL;
-       }
-
        if (priv->outbox_of_transport) {
                g_hash_table_destroy (priv->outbox_of_transport);
                priv->outbox_of_transport = NULL;
@@ -852,7 +855,7 @@ volume_path_is_mounted (const gchar* path)
         * GnomeVFSVolume even if the drive is not mounted: */
        /*
        GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, 
-               MODEST_MCC1_VOLUMEPATH);
+                                g_getenv (MODEST_MMC1_VOLUMEPATH_ENV));
        if (volume) {
                gnome_vfs_volume_unref(volume);
        }
@@ -952,7 +955,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
                add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
        
        /* This is a singleton, so it does not need to be unrefed. */
-       if (volume_path_is_mounted (MODEST_MCC1_VOLUMEPATH)) {
+       if (volume_path_is_mounted (g_getenv (MODEST_MMC1_VOLUMEPATH_ENV))) {
                /* It is mounted: */
                add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); 
        }
@@ -1041,8 +1044,8 @@ modest_tny_account_store_alert (TnyAccountStore *self,
                                gboolean question, 
                                GError *error)
 {
-       ModestTransportStoreProtocol proto =
-               MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; 
+       ModestProtocolType protocol_type = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
+       ModestProtocol *protocol = NULL;
        const gchar* server_name = "";
        gchar *prompt = NULL;
        gboolean retval = TRUE;
@@ -1053,14 +1056,14 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        /* Get the server name: */
        if (account) {
                server_name = tny_account_get_hostname (account);
-               const gchar *proto_name = tny_account_get_proto (account);
-               if (proto_name)
-                       proto = modest_protocol_info_get_transport_store_protocol (proto_name);
-               else {
+               protocol_type = modest_tny_account_get_protocol_type (account);
+               if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){
                        g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, 
                                  tny_account_get_id (account));
                        return FALSE;
                }
+               protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+                                                                         protocol_type);
        }
 
        switch (error->code) {
@@ -1076,20 +1079,10 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        case TNY_SERVICE_ERROR_UNAVAILABLE:
                /* You must be working online for this operation */
        case TNY_SERVICE_ERROR_CONNECT:
-               switch (proto) {
-               case MODEST_PROTOCOL_STORE_POP:
-                       prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"),
-                                                 server_name);
-                       break;
-               case MODEST_PROTOCOL_STORE_IMAP:
-                       prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"),
-                                                 server_name);
-                       break;
-               case MODEST_PROTOCOL_TRANSPORT_SMTP:
-                       prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"),
-                                                 server_name);
-                       break;
-               default:
+               if (protocol) {
+                       prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, server_name);
+               }
+               if (!prompt) {
                        g_return_val_if_reached (FALSE);
                }
                break;
@@ -1098,20 +1091,10 @@ modest_tny_account_store_alert (TnyAccountStore *self,
                /* It seems that there's no better error to show with
                 * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE
                 * may appear if there's a timeout during auth */
-               switch (proto) {
-               case MODEST_PROTOCOL_STORE_POP:
-                       prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"),
-                                                 server_name);
-                       break;
-               case MODEST_PROTOCOL_STORE_IMAP:
-                       prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"),
-                                                 server_name);
-                       break;
-               case MODEST_PROTOCOL_TRANSPORT_SMTP:
-                       prompt = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"),
-                                                 server_name);
-                       break;
-               default:
+               if (protocol) {
+                       prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_AUTH_ERROR, server_name);
+               }
+               if (!prompt) {
                        g_return_val_if_reached (FALSE);
                }
                break;
@@ -1134,12 +1117,13 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
                retval = modest_platform_run_certificate_confirmation_dialog (server_name,
                                                                              error->message);
-       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
+       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE ||
+                error->code == TNY_SERVICE_ERROR_CONNECT) {
+
                modest_platform_run_information_dialog (NULL, prompt, TRUE);
 
                /* Show the account dialog if it was wrong */
-               if (error->code == TNY_SERVICE_ERROR_CONNECT || 
-                   error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
+               if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
                        show_wrong_password_dialog (account);
 
                retval = TRUE;
@@ -1398,17 +1382,17 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection
        if (!server_account_name) {
                return NULL; /* No connection-specific SMTP server was specified for this connection. */
        }
-               
+
        TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, 
                                                                           MODEST_TNY_ACCOUNT_STORE_QUERY_ID, 
                                                                           server_account_name);
 
        /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */
-       g_free (server_account_name);   
+       g_free (server_account_name);
 
        /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
        g_object_unref (connection);
-       
+
        return account;
 #else
        return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
@@ -1512,34 +1496,6 @@ add_existing_accounts (ModestTnyAccountStore *self)
        modest_account_mgr_free_account_names (account_names);
 }
 
-static void 
-connection_status_changed (TnyAccount *account, 
-                          TnyConnectionStatus status, 
-                          gpointer data)
-{
-       /* We do this here and not in the connection policy because we
-          don't want to do it for every account, just for the
-          accounts that are interactively added when modest is
-          runnning */
-       if (status == TNY_CONNECTION_STATUS_CONNECTED) {
-               const gchar *account_name;
-               ModestWindow *main_window;
-               ModestTnyAccountStorePrivate *priv = NULL;
-               
-               priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (data);
-
-               /* Remove this handler */
-               priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, 
-                                                                 G_OBJECT (account),
-                                                                 "connection_status_changed");
-
-               /* Perform a send receive */
-               account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-               main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
-               modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, main_window);
-       }
-}
-
 static TnyAccount*
 create_tny_account (ModestTnyAccountStore *self,
                    const gchar *name,
@@ -1548,7 +1504,7 @@ create_tny_account (ModestTnyAccountStore *self,
 {
        TnyAccount *account = NULL;
        ModestTnyAccountStorePrivate *priv = NULL;
-       
+
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
        account = modest_tny_account_new_from_account (priv->account_mgr,
@@ -1562,18 +1518,6 @@ create_tny_account (ModestTnyAccountStore *self,
                   we use a new account if any */
                forget_password_in_memory (self, tny_account_get_id (account));
 
-               /* Install a signal handler that will refresh the
-                  account the first time it becomes online. Do this
-                  only if we're adding a new account while the
-                  program is running (we do not want to do this
-                  allways) */
-               if (type == TNY_ACCOUNT_TYPE_STORE && notify)
-                       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, 
-                                                                      G_OBJECT (account), 
-                                                                      "connection_status_changed",
-                                                                      G_CALLBACK (connection_status_changed),
-                                                                      self);
-
                /* Set the account store */
                g_object_set_data (G_OBJECT(account), "account_store", self);
        } else {
@@ -1671,7 +1615,7 @@ add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self,
        info = g_slice_new0 (AddOutboxInfo);
        info->account_store = self;
        info->transport_account = g_object_ref (transport_account);
-       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, 
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, 
                                            add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info);
        g_object_unref (account_outbox);
 }
@@ -1727,27 +1671,10 @@ insert_account (ModestTnyAccountStore *self,
        g_object_unref (transport_account);
 }
 
-static gboolean
+static inline gboolean
 only_local_accounts (ModestTnyAccountStore *self)
 {
-       ModestTnyAccountStorePrivate *priv = NULL;
-       gboolean only_local = TRUE;
-       TnyIterator *iter;
-
-       /* Check if this is the first remote account we add */
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-       iter = tny_list_create_iterator (priv->store_accounts);
-
-       while (!tny_iterator_is_done (iter) && only_local) {
-               TnyAccount *account = (TnyAccount *) tny_iterator_get_current (iter);
-               if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
-                       only_local = FALSE;
-               g_object_unref (account);
-               tny_iterator_next (iter);
-       }
-       g_object_unref (iter);
-
-       return only_local;
+       return (modest_tny_account_store_get_num_remote_accounts (self) > 0) ? FALSE : TRUE;
 }
 
 static void
@@ -1783,15 +1710,6 @@ on_account_disconnect_when_removing (TnyCamelAccount *account,
        self = MODEST_TNY_ACCOUNT_STORE (user_data);
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
 
-       /* Remove the connection-status-changed handler if it's still there */
-       if (modest_signal_mgr_is_connected (priv->sighandlers, 
-                                           G_OBJECT (account),
-                                           "connection_status_changed")) {
-               priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, 
-                                                                 G_OBJECT (account),
-                                                                 "connection_status_changed");
-       }
-
        /* Cancel all pending operations */
        tny_account_cancel (TNY_ACCOUNT (account));
        
@@ -1994,6 +1912,12 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc
        return TNY_TRANSPORT_ACCOUNT (tny_account);
 }
 
+static void 
+foreach_free_string(gpointer data,
+                   gpointer user_data)
+{
+       g_free (data);
+}
 
 static void
 add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
@@ -2010,6 +1934,7 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
        if (err) {
                g_error_free (err);
                g_return_if_reached ();
+               return;
        }
                                
        /* Look at each connection-specific transport account for the 
@@ -2028,6 +1953,10 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
                }                               
                iter = g_slist_next (iter);
        }
+
+       /* Free the list */
+       g_slist_foreach (list_specifics, foreach_free_string, NULL);
+       g_slist_free (list_specifics);
 }
 
 static void
@@ -2046,6 +1975,7 @@ remove_connection_specific_transport_accounts (ModestTnyAccountStore *self)
        if (err) {
                g_error_free (err);
                g_return_if_reached ();
+               return;
        }
                                
        /* Look at each connection-specific transport account for the 
@@ -2067,6 +1997,10 @@ remove_connection_specific_transport_accounts (ModestTnyAccountStore *self)
                }                               
                iter = g_slist_next (iter);
        }
+
+       /* Free the list */
+       g_slist_foreach (list_specifics, foreach_free_string, NULL);
+       g_slist_free (list_specifics);
 }
 
 
@@ -2089,7 +2023,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self,
                TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter));
                TnyIterator *folders_iter = NULL;
 
-               tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL);
+               tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL);
                folders_iter = tny_list_create_iterator (folders);
 
                while (msg == NULL && !tny_iterator_is_done (folders_iter)) {
@@ -2150,49 +2084,6 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou
        return header_acc;
 }
 
-GtkWidget *
-modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self,
-                                                      const gchar *account_name)
-{
-       ModestTnyAccountStorePrivate *priv;
-       gpointer dialog_as_gpointer = NULL;
-       gboolean found;
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash,
-                                             account_name, NULL, (gpointer*)&dialog_as_gpointer);
-
-       if (found) {
-               modest_account_settings_dialog_check_allow_changes ((ModestAccountSettingsDialog *) dialog_as_gpointer);
-               return (GtkWidget *) dialog_as_gpointer;
-       } else {
-               ModestAccountSettings *settings;
-               GtkWidget *dialog;
-               dialog = (GtkWidget *) modest_account_settings_dialog_new ();
-               settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name);
-               modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings);
-               g_object_unref (settings);
-               modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
-               modest_account_settings_dialog_check_allow_changes (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
-               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
-               
-               g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (account_name), dialog);
-               
-               g_signal_connect (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), 
-                                 g_strdup (account_name));
-                       
-               /* Show it and delete it when it closes: */
-               g_signal_connect_swapped (dialog, 
-                                         "response", 
-                                         G_CALLBACK (gtk_widget_destroy), 
-                                         dialog);
-               gtk_widget_show (GTK_WIDGET (dialog));
-
-               return dialog;
-       }
-       
-}
-
 typedef struct {
        ModestTnyAccountStore *account_store;
        ModestTnyAccountStoreShutdownCallback callback;
@@ -2210,6 +2101,8 @@ account_shutdown_callback (TnyCamelAccount *account, gboolean canceled, GError *
                        op_data->callback (op_data->account_store, op_data->userdata);
                g_object_unref (op_data->account_store);
                g_free (op_data);
+       } else {
+               g_object_unref (op_data->account_store);
        }
 }
 
@@ -2220,11 +2113,18 @@ account_shutdown (TnyAccount *account, ShutdownOpData *op_data)
 
        if (TNY_IS_STORE_ACCOUNT (account) && 
            !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
-               return;
+               goto frees;
 
-       op_data->pending++;
+       /* Disconnect account */
+       if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) {
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, 
+                                             account_shutdown_callback, op_data);
+               return;
+       }
 
-       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, account_shutdown_callback, op_data);
+ frees:
+       op_data->pending--;
+       g_object_unref (op_data->account_store);
 }
 
 
@@ -2233,13 +2133,23 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self,
                                   ModestTnyAccountStoreShutdownCallback callback,
                                   gpointer userdata)
 {
-       ShutdownOpData *op_data = g_new0 (ShutdownOpData, 1);
+       gint i, num_accounts;
+       ShutdownOpData *op_data;
        ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Get references */
+       num_accounts = tny_list_get_length (priv->store_accounts) + 
+               tny_list_get_length (priv->transport_accounts);
+       for (i = 0 ; i < num_accounts ; i++)
+               g_object_ref (self);
+
+       /* Create the helper object */
+       op_data = g_new0 (ShutdownOpData, 1);
        op_data->callback = callback;
        op_data->userdata = userdata;
-       op_data->pending = 0;
-       op_data->account_store = g_object_ref (self);
-       
+       op_data->pending = num_accounts;
+       op_data->account_store = self;
+
        /* Destroy all accounts. Disconnect all accounts before they are destroyed */
        if (priv->store_accounts) {
                tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data);
@@ -2252,7 +2162,49 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self,
        if (op_data->pending == 0) {
                if (op_data->callback)
                        op_data->callback (op_data->account_store, op_data->userdata);
-               g_object_unref (op_data->account_store);
                g_free (op_data);
        }
 }
+
+gboolean 
+modest_tny_account_store_is_send_mail_blocked (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       return priv->send_mail_blocked;
+}
+
+void 
+modest_tny_account_store_set_send_mail_blocked (ModestTnyAccountStore *self, 
+                                               gboolean blocked)
+{
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       priv->send_mail_blocked = blocked;
+}
+
+static void
+count_remote_accounts (gpointer data, gpointer user_data)
+{
+       TnyFolderStore *account = TNY_FOLDER_STORE (data);
+       gint *count = (gint *) user_data;
+
+       if (modest_tny_folder_store_is_remote (account))
+               (*count)++;
+}
+
+guint
+modest_tny_account_store_get_num_remote_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       gint count = 0;
+
+       /* Count remote accounts */
+       tny_list_foreach (priv->store_accounts, (GFunc) count_remote_accounts, &count);
+
+       return count;
+}