From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 11 Mar 2008 13:23:25 +0000 (+0000)
Subject: Work to fix bug NB#81294
X-Git-Tag: git_migration_finished~1574
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=4e787e46e4580814fd5450730b4f976ea6b927a5;ds=sidebyside

Work to fix bug NB#81294
* src/maemo/modest-account-view-window.c:
        * Now we also disconnect the account if account is not connected
         but also it's not in disconnected status (handles broken
         states).
* src/modest-tny-account.c:
        * Sets the password setting dialogs again to force getting
          feedback if connection attempt fails.

pmo-trunk-r4294
---

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 066ff21..b9ea58c 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -154,6 +154,7 @@ 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 ();
@@ -176,27 +177,34 @@ 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) {
-			/* FIXME: We should only cancel those of this account */
-			modest_mail_operation_queue_cancel_all (queue);
-
-			/* Also disconnect the account */
-			if (tny_account_get_connection_status (store_account) == TNY_CONNECTION_STATUS_CONNECTED) {
-				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_CONNECTED) {
-				tny_account_cancel (transport_account);
-				tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
-							      FALSE, NULL, NULL);
-			}
 			retval = TRUE;
 		} else {
 			retval = FALSE;
 		}
-	}
+	} 
+
+	if (do_disconnect) {
+
+		/* FIXME: We should only cancel those of this account */
+		modest_mail_operation_queue_cancel_all (queue);
 
+		/* 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);
+		}
+	}
+		
 	/* Frees */
 	g_object_unref (store_account);
 	g_object_unref (transport_account);
diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 838af3e..679884a 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -526,6 +526,8 @@ modest_tny_account_update_from_account (TnyAccount *tny_account,
 	g_object_unref (server_settings);
 	g_object_unref (settings);
 
+	tny_account_set_forget_pass_func (tny_account, NULL);
+	tny_account_set_pass_func (tny_account, NULL);
 	tny_account_set_forget_pass_func (tny_account,
 					  forget_pass_func ? forget_pass_func : forget_pass_dummy);
 	tny_account_set_pass_func (tny_account,