X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-account-view-window.c;h=70bea39ac3f2a686338e7857a874b21aa1c739e2;hb=d3152f5a6ea0f939f9535fd8024538d95f14b588;hp=7827f809f28dfcf9cd516b561255821b1cb66ffe;hpb=9ee9c1e0296c01b8bdf9f97123aad5a5a13e5643;p=modest

diff --git a/src/gnome/modest-account-view-window.c b/src/gnome/modest-account-view-window.c
index 7827f80..70bea39 100644
--- a/src/gnome/modest-account-view-window.c
+++ b/src/gnome/modest-account-view-window.c
@@ -32,11 +32,12 @@
 
 #include <widgets/modest-account-view-window.h>
 #include <widgets/modest-account-view.h>
-
+#include "modest-ui-actions.h"
 #include <modest-runtime.h>
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
 #include "modest-account-assistant.h"
+#include "modest-account-protocol.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
 
@@ -44,8 +45,6 @@
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
 static void                            modest_account_view_window_init         (ModestAccountViewWindow *obj);
 static void                            modest_account_view_window_finalize     (GObject *obj);
-static gboolean                        check_for_active_account                (ModestAccountViewWindow *self, 
-										const gchar* account_name);
 /* list my signals */
 enum {
 	/* MY_SIGNAL_1, */
@@ -167,13 +166,13 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	if (!account_title)
 		return;
 
-	if (check_for_active_account (self, account_name)) {
+	if (modest_ui_actions_check_for_active_account (self, account_name)) {
 		gboolean removed;
 		gchar *txt;
 		gint response;
 
 		if (modest_account_mgr_get_store_protocol (account_mgr, account_name) 
-		    == MODEST_PROTOCOL_STORE_POP) {
+		    == MODEST_PROTOCOLS_STORE_POP) {
 				txt = g_strdup_printf (_("emev_nc_delete_mailbox"), 
 						       account_title);
 		} else {
@@ -201,84 +200,36 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *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)
-{
-	ModestTnyAccountStore *acc_store;
-	ModestMailOperationQueue* queue;
-	TnyConnectionStatus store_conn_status, transport_conn_status;
-	TnyAccount *store_account = NULL, *transport_account = NULL;
-	gboolean retval = TRUE;
-
-	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);
-	transport_account = 
-		modest_tny_account_store_get_server_account (acc_store,
-							     account_name,
-							     TNY_ACCOUNT_TYPE_TRANSPORT);
-
-	store_conn_status = tny_account_get_connection_status (store_account);
-	transport_conn_status = tny_account_get_connection_status (transport_account);
-
-	if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
-	    transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
-		gint response;
-
-		response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
-								_("emev_nc_disconnect_account"));
-		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;
-		}
-	}
-
-	/* Frees */
-	g_object_unref (store_account);
-	g_object_unref (transport_account);
-	
-	return retval;
-}
-
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-  	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
+	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
 	
 	gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
 	if (!account_name)
 		return;
 		
-	if (check_for_active_account (self, account_name)) {
-		modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
-		
+	/* Check whether any connections are active, and cancel them if 
+	 * the user wishes.
+	 */
+	if (modest_ui_actions_check_for_active_account (self, account_name)) {
+		ModestAccountProtocol *proto;
+		ModestProtocolType proto_type;
+
+		/* Get proto */
+		proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+								    account_name);
+		proto = (ModestAccountProtocol *)
+			modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), 
+								       proto_type);
+
+		/* Create and show the dialog */
+		if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+			ModestAccountSettingsDialog *dialog =
+				modest_account_protocol_get_account_settings_dialog (proto, account_name);
+			gtk_widget_show (GTK_WIDGET (dialog));
+		}
 	}
-	
 	g_free (account_name);
 }
 
@@ -319,7 +270,7 @@ on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	/* there is no such wizard yet */
 	wizard = GTK_DIALOG (modest_account_assistant_new (modest_runtime_get_account_mgr ()));
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), 
-				     GTK_WINDOW (wizard));
+				     GTK_WINDOW (wizard), self);
 
 	/* if there is already another modal dialog, make it non-modal */
 	if (dialog)