X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=fc40ea2be4d2ad9d3b16b4ee2e761fcb7aa1ab71;hp=9fed7b7832580dedc481cea539385a99368dfa44;hb=d2766e0125d45ae66dbe70b51eb90e3b0e493982;hpb=b7ddf68065ddddb01a3fc97f9b7592610ef25efe

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 9fed7b7..fc40ea2 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -166,10 +166,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 		gboolean removed;
 		GtkWidget *dialog;
 		gchar *txt;
-
-		/* Freeze updates, so we can do just one update afterwards, 
-		 * instead of responding to every conf key change: */
-		modest_account_view_block_conf_updates (priv->account_view);
 		
 		dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
 						      GTK_WINDOW (self),
@@ -179,9 +175,7 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 						      GTK_STOCK_OK,
 						      GTK_RESPONSE_ACCEPT,
 						      NULL);
-		/* TODO: This confirmation dialog is not specified in the Maemo UI spec, 
-		 * but we really need one: */
-		txt = g_strdup_printf (_("Do you really want to delete the account %s?"), 
+		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);
@@ -202,12 +196,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 									     account_name,
 									     FALSE);
 									     
-			if (removed && is_default) {
-				/* Set a different account as the default, so there is always at least one default:
-				 * This is not specified, and might be the wrong behaviour. murrayc. */
-				modest_account_mgr_set_first_account_as_default (account_mgr);
-			}
-									 
 			if (removed) {
 				/* Show confirmation dialog ??? */
 			} else {
@@ -217,9 +205,6 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 		gtk_widget_destroy (dialog);
 		g_free (account_title);
 		g_free (account_name);
-		
-		/* Update the view: */
-		modest_account_view_unblock_conf_updates (priv->account_view);
 	}
 }
 
@@ -232,9 +217,23 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	if (!account_name)
 		return;
 		
-	/* Freeze updates, so we can do just one update afterwards, 
-	 * instead of responding to every conf key change: */
-	modest_account_view_block_conf_updates (priv->account_view);
+	/* 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)) {
+		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);
+		}
+		else
+			return;
+	}
 		
 	/* Show the Account Settings window: */
 	ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
@@ -245,31 +244,16 @@ on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 	
 	g_free (account_name);
-	
-	/* Update the view: */
-	modest_account_view_unblock_conf_updates (priv->account_view);
-	
-	/* TODO: Call modest_account_view_select_account() when 
-	 * the view has actually been update. */
 }
 
 static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-	
-	/* Freeze updates, so we can do just one update afterwards, 
-	 * instead of responding to every conf key change: */
-	modest_account_view_block_conf_updates (priv->account_view);
-	
 	/* Show the easy-setup wizard: */
 	ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
 	gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
 	gtk_dialog_run (GTK_DIALOG (wizard));
 	gtk_widget_destroy (GTK_WIDGET (wizard));
-	
-	/* Allow updates: */
-	modest_account_view_unblock_conf_updates (priv->account_view);
 }
 
 
@@ -368,6 +352,8 @@ modest_account_view_window_init (ModestAccountViewWindow *obj)
 	
 	gtk_box_pack_start (GTK_BOX((GTK_DIALOG (obj)->action_area)), GTK_WIDGET (button_box_new (obj)), 
 		TRUE, TRUE, 2);
+
+	gtk_window_set_title (GTK_WINDOW (obj), _("mcen_ti_emailsetup_accounts"));
 }