* Fixes NB#85743, do not hang when changing outgoing settings while sending

pmo-trunk-r4551

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 1ba48c6..4c30746 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -158,7 +158,6 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
        TnyConnectionStatus store_conn_status, transport_conn_status;
        TnyAccount *store_account = NULL, *transport_account = NULL;
        gboolean retval = TRUE;
-       gboolean do_disconnect = TRUE;
 
        acc_store = modest_runtime_get_account_store ();
        queue = modest_runtime_get_mail_operation_queue ();
@@ -194,7 +193,6 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
 
                response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
                                                                _("emev_nc_disconnect_account"));
-               do_disconnect = (response == FALSE);
                if (response == GTK_RESPONSE_OK) {
                        retval = TRUE;
                } else {
@@ -202,7 +200,7 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
                }
        } 
 
-       if (do_disconnect) {
+       if (retval) {
 
                /* FIXME: We should only cancel those of this account */
                modest_mail_operation_queue_cancel_all (queue);
@@ -210,13 +208,11 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
                /* Also disconnect the account */
                if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
                    (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
-                       tny_account_cancel (store_account);
                        tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
                                                      FALSE, NULL, NULL);
                }
                if ((tny_account_get_connection_status (transport_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
                    (tny_account_get_connection_status (transport_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
-                       tny_account_cancel (transport_account);
                        tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
                                                      FALSE, NULL, NULL);
                }