X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=3279549cdbfe12865e6965004756a91c50deb3ed;hb=e5816f12f8875a47267d1c83091216c78dd62bcc;hp=1a57a12ee94940f6ce438fa35abe11dc2908674e;hpb=a79453efa51820eb92e37790f58bd745fb78d176;p=modest

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 1a57a12..3279549 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -219,17 +219,17 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 		
 	/* Check whether any connections are active, and cancel them if 
 	 * the user wishes.
-	 * TODO: Check only for connections with this account, instead of all.
-	 * Maybe we need a queue per account.
 	 */
-	ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue ();
-	if (modest_mail_operation_queue_num_elements(queue)) {
+	ModestAccountMgr* mgr = modest_runtime_get_account_mgr ();
+	ModestMailOperationQueue* queue = modest_runtime_get_mail_operation_queue();
+	if (modest_account_mgr_account_is_busy(mgr, account_name)) {
 		GtkWidget *note = hildon_note_new_confirmation (GTK_WINDOW (self), 
 			_("emev_nc_disconnect_account"));
 		const int response = gtk_dialog_run (GTK_DIALOG(note));
 		gtk_widget_destroy (note);
 		if (response == GTK_RESPONSE_OK) {
-			modest_mail_operation_queue_cancel_all(queue);;
+			/* FIXME: We should only cancel those of this account */
+			modest_mail_operation_queue_cancel_all(queue);
 		}
 		else
 			return;