X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-account-view-window.c;h=5f3eeb0e153c658e105777d1f8a4e06cff9742dd;hb=0e377cfc61f7e67a47e50096e1ad4a3dead53731;hp=96930cf1377755ae258f54bacd6508d3993482e4;hpb=ee44d29d168d38d91ae753a3f47cb00ad5e0b8bd;p=modest

diff --git a/src/hildon2/modest-account-view-window.c b/src/hildon2/modest-account-view-window.c
index 96930cf..5f3eeb0 100644
--- a/src/hildon2/modest-account-view-window.c
+++ b/src/hildon2/modest-account-view-window.c
@@ -34,6 +34,7 @@
 #include <widgets/modest-account-view.h>
 
 #include <modest-runtime.h>
+#include "modest-ui-actions.h"
 #include "modest-platform.h"
 #include "modest-text-utils.h"
 #include "modest-account-protocol.h"
@@ -125,91 +126,6 @@ modest_account_view_window_finalize (GObject *self)
 	G_OBJECT_CLASS(parent_class)->finalize (self);
 }
 
-
-/** Check whether any connections are active, and cancel them if 
- * the user wishes.
- * Returns TRUE is there was no problem, 
- * or if an operation was cancelled so we can continue.
- * Returns FALSE if the user chose to cancel his request instead.
- */
-static gboolean
-check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name)
-{
-	ModestTnySendQueue *send_queue;
-	ModestTnyAccountStore *acc_store;
-	ModestMailOperationQueue* queue;
-	TnyConnectionStatus store_conn_status;
-	TnyAccount *store_account = NULL, *transport_account = NULL;
-	gboolean retval = TRUE, sending = FALSE;
-
-	acc_store = modest_runtime_get_account_store ();
-	queue = modest_runtime_get_mail_operation_queue ();
-
-	store_account = 
-		modest_tny_account_store_get_server_account (acc_store,
-							     account_name,
-							     TNY_ACCOUNT_TYPE_STORE);
-
-	/* This could happen if the account was deleted before the
-	   call to this function */
-	if (!store_account)
-		return FALSE;
-
-	transport_account = 
-		modest_tny_account_store_get_server_account (acc_store,
-							     account_name,
-							     TNY_ACCOUNT_TYPE_TRANSPORT);
-
-	/* This could happen if the account was deleted before the
-	   call to this function */
-	if (!transport_account) {
-		g_object_unref (store_account);
-		return FALSE;
-	}
-
-	/* If the transport account was not used yet, then the send
-	   queue could not exist (it's created on demand) */
-	send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE);
-	if (TNY_IS_SEND_QUEUE (send_queue))
-		sending = modest_tny_send_queue_sending_in_progress (send_queue);
-
-	store_conn_status = tny_account_get_connection_status (store_account);
-	if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
-		gint response;
-
-		response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
-								_("emev_nc_disconnect_account"));
-		if (response == GTK_RESPONSE_OK) {
-			retval = TRUE;
-		} else {
-			retval = FALSE;
-		}
-	}
-
-	if (retval) {
-
-		/* 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_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
-						      FALSE, NULL, NULL);
-		}
-		if (sending) {
-			tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
-						      FALSE, NULL, NULL);
-		}
-	}
-		
-	/* Frees */
-	g_object_unref (store_account);
-	g_object_unref (transport_account);
-	
-	return retval;
-}
-
 static void
 on_account_settings_dialog_response (GtkDialog *dialog,
 				     gint response,
@@ -224,20 +140,20 @@ on_account_settings_dialog_response (GtkDialog *dialog,
 	store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
 								     account_name,
 								     TNY_ACCOUNT_TYPE_STORE);
-       
-	/* Reconnect the store account, no need to reconnect the
-	   transport account because it will connect when needed */
-	if (tny_account_get_connection_status (store_account) == 
-	    TNY_CONNECTION_STATUS_DISCONNECTED)
-		tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
-					      TRUE, NULL, NULL);
-
+        if (store_account) {
+		/* Reconnect the store account, no need to reconnect the
+		   transport account because it will connect when needed */
+		if (tny_account_get_connection_status (store_account) ==
+		    TNY_CONNECTION_STATUS_DISCONNECTED)
+			tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+						      TRUE, NULL, NULL);
+		g_object_unref (store_account);
+	}
 	/* Disconnect this handler */
 	g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
 
 	/* Free */
 	g_free (account_name);
-	g_object_unref (store_account);
 }
 
 static void
@@ -255,7 +171,7 @@ on_account_activated (GtkTreeView *account_view,
 	/* Check whether any connections are active, and cancel them if 
 	 * the user wishes.
 	 */
-	if (check_for_active_account (self, account_name)) {
+	if (modest_ui_actions_check_for_active_account ((ModestWindow *) self, account_name)) {
 		ModestAccountProtocol *proto;
 		ModestProtocolType proto_type;