X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=3e90c4b163c416a3809293fe68f1e86c4949edfd;hp=7c33ebd328849b731945b37a750b615638e2a1ed;hb=64333784e87e5ea5c6156078caacaca7ffbd6b5f;hpb=cabefc7e018a82b76e831abaf44be6605ee3e255

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 7c33ebd..3e90c4b 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -39,6 +39,7 @@
 #include "modest-tny-platform-factory.h"
 #include "maemo/easysetup/modest-easysetup-wizard.h"
 #include "maemo/modest-account-settings-dialog.h"
+#include <maemo/modest-maemo-utils.h>
 #include "widgets/modest-ui-constants.h"
 
 /* 'private'/'protected' functions */
@@ -127,23 +128,71 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
 	GtkTreeModel                   *model;
 	GtkTreeIter                     iter;
 	gboolean                        has_selection;
-	gchar                          *account_name;
-	gchar                          *default_account_name;
 	
 	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 
 	has_selection =
 		gtk_tree_selection_get_selected (sel, &model, &iter);
 
+	/* Set the status of the buttons */
 	gtk_widget_set_sensitive (priv->edit_button, has_selection);
 	gtk_widget_set_sensitive (priv->delete_button, has_selection);	
+}
 
-	account_name = modest_account_view_get_selected_account (priv->account_view);
-	default_account_name = modest_account_mgr_get_default_account(
-		modest_runtime_get_account_mgr());
+/** 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_STORE);
+
+	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) {
+		GtkWidget *note = NULL;
+		gint response;
+
+		note = hildon_note_new_confirmation (GTK_WINDOW (self), 
+						     _("emev_nc_disconnect_account"));
+		response = gtk_dialog_run (GTK_DIALOG(note));
 
-	g_free (account_name);
-	g_free (default_account_name);
+		gtk_widget_destroy (note);
+		if (response == GTK_RESPONSE_OK) {
+			/* FIXME: We should only cancel those of this account */
+			modest_mail_operation_queue_cancel_all (queue);
+			retval = TRUE;
+		} else {
+			retval = FALSE;
+		}
+	}
+
+	/* Frees */
+	g_object_unref (store_account);
+	g_object_unref (transport_account);
+	
+	return retval;
 }
 
 static void
@@ -160,50 +209,47 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	if(!account_name)
 		return;
 		
-	gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
-
 	if (account_name) {
-		gboolean removed;
-		GtkWidget *dialog;
-		gchar *txt;
+		gchar *account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
 		
-		dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
-						      GTK_WINDOW (self),
-						      GTK_DIALOG_MODAL,
-						      GTK_STOCK_YES,
-						      GTK_RESPONSE_ACCEPT,
-						      GTK_STOCK_NO,
-						      GTK_RESPONSE_REJECT,
-						      NULL);
-		txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), 
-			account_title);
-		gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-				    gtk_label_new (txt), FALSE, FALSE, 0);
-		gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-		g_free (txt);
-
-		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-			/* Remove account. If succeeded it removes also 
-			   the account from the ModestAccountView */
-			  
-			gboolean is_default = FALSE;
-			gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
-			if (default_account_name && (strcmp (default_account_name, account_name) == 0))
-				is_default = TRUE;
-			g_free (default_account_name);
-				
-			removed = modest_account_mgr_remove_account (account_mgr,
-									     account_name,
-									     FALSE);
-									     
-			if (removed) {
-				/* Show confirmation dialog ??? */
+		if (check_for_active_account (self, account_name)) {
+			/* The warning text depends on the account type: */
+			gchar *txt = NULL;	
+			if (modest_account_mgr_get_store_protocol (account_mgr, account_name) 
+				== MODEST_PROTOCOL_STORE_POP) {
+				txt = g_strdup_printf (_("emev_nc_delete_mailbox"), 
+					account_title);
 			} else {
-				/* Show error dialog ??? */
+				txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), 
+					account_title);
+			}
+			
+			GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), 
+				txt));
+			gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+			gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+			g_free (txt);
+			txt = NULL;
+	
+			if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
+				/* Remove account. If it succeeds then it also removes
+				   the account from the ModestAccountView: */
+				  
+				gboolean is_default = FALSE;
+				gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
+				if (default_account_name && (strcmp (default_account_name, account_name) == 0))
+					is_default = TRUE;
+				g_free (default_account_name);
+					
+				gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name);
+				if (!removed) {
+					g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
+				}
 			}
+			gtk_widget_destroy (GTK_WIDGET (dialog));
+			g_free (account_title);
 		}
-		gtk_widget_destroy (dialog);
-		g_free (account_title);
+		
 		g_free (account_name);
 	}
 }
@@ -220,40 +266,63 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	/* Check whether any connections are active, and cancel them if 
 	 * the user wishes.
 	 */
-	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) {
-			/* FIXME: We should only cancel those of this account */
-			modest_mail_operation_queue_cancel_all(queue);
-		}
-		else
-			return;
-	}
+	if (check_for_active_account (self, account_name)) {
 		
-	/* Show the Account Settings window: */
-	ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
-	modest_account_settings_dialog_set_account_name (dialog, account_name);
-	
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+		/* Show the Account Settings window: */
+		ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+
+		modest_account_settings_dialog_set_account_name (dialog, account_name);
+		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+		modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
+	}
 	
 	g_free (account_name);
 }
 
 static void
+on_wizard_response (GtkDialog *dialog, gint response, gpointer user_data)
+{	
+	/* The response has already been handled by the wizard dialog itself,
+	 * creating the new account.
+	 */
+	 
+	/* Destroy the dialog: */
+	if (dialog) {
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+		modest_window_mgr_set_modal_dialog (
+			modest_runtime_get_window_mgr(), NULL);
+	}
+}
+
+static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-	/* Show the easy-setup wizard: */
-	ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+	GtkDialog *wizard, *dialog;
+	
+	/* Show the easy-setup wizard: */	
+	dialog = modest_window_mgr_get_modal_dialog (modest_runtime_get_window_mgr());
+	if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+		/* old wizard is active already; 
+		 */
+		gtk_window_present (GTK_WINDOW(dialog));
+		return;
+	}
+	
+	/* there is no such wizard yet */
+	wizard = GTK_DIALOG(modest_easysetup_wizard_dialog_new ());
+	modest_window_mgr_set_modal_dialog (modest_runtime_get_window_mgr(), 
+					    GTK_DIALOG(wizard));
+
+	/* if there is already another modal dialog, make it non-modal */
+	if (dialog)
+		gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
+	
+	gtk_window_set_modal (GTK_WINDOW (wizard), TRUE);
 	gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
-	gtk_dialog_run (GTK_DIALOG (wizard));
-	gtk_widget_destroy (GTK_WIDGET (wizard));
+	/* Destroy the dialog when it is closed: */
+	g_signal_connect (G_OBJECT (wizard), "response", G_CALLBACK
+			  (on_wizard_response), self);
+	gtk_widget_show (GTK_WIDGET (wizard));
 }
 
 
@@ -307,7 +376,6 @@ button_box_new (ModestAccountViewWindow *self)
 	return button_box;
 }
 
-
 static GtkWidget*
 window_vbox_new (ModestAccountViewWindow *self)
 {
@@ -317,6 +385,7 @@ window_vbox_new (ModestAccountViewWindow *self)
 	GtkWidget *main_hbox     = gtk_hbox_new (FALSE, 6);
 	
 	priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+
 	gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
 	gtk_widget_show (GTK_WIDGET (priv->account_view));
 
@@ -344,9 +413,6 @@ window_vbox_new (ModestAccountViewWindow *self)
 static void
 modest_account_view_window_init (ModestAccountViewWindow *obj)
 {
-/*
-	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-*/		
 	gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->vbox)), GTK_WIDGET (window_vbox_new (obj)), 
 		TRUE, TRUE, 2);
 	
@@ -356,7 +422,6 @@ modest_account_view_window_init (ModestAccountViewWindow *obj)
 	gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
 }
 
-
 GtkWidget*
 modest_account_view_window_new (void)
 {