X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=6c1375b77fe4bba65227499e0f38ec59f43330c4;hp=8e4a312a8cb49accd0b8257d1903f217f08712a9;hb=ae06a114724e713c7cc743f8ea792ca91f65c4d4;hpb=f0046400b0afc01694454e0b4c865803f03acdd3

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 8e4a312..6c1375b 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -146,90 +146,6 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
 	gtk_widget_set_sensitive (priv->delete_button, has_selection);
 }
 
-/** 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_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
@@ -243,7 +159,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	account_name = modest_account_view_get_selected_account (priv->account_view);
 	account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
 
-	if (check_for_active_account (self, account_name))
+	if (modest_ui_actions_check_for_active_account (self, account_name))
 		modest_ui_actions_on_delete_account (GTK_WINDOW (self), account_name, account_title);
 
 	g_free (account_title);
@@ -292,7 +208,7 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	/* 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 (self, account_name)) {
 		ModestAccountProtocol *proto;
 		ModestProtocolType proto_type;