X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=6698fc367eeb9c24773a0673d6dbffb5f9d25b6b;hp=2332b2300cbd8bbab43f0b0bf0c14124bbac410b;hb=f541209a85cb6c71c79da1df81afbe10c448690a;hpb=e364a3a6dff0382e4f96aec0647937d40b33f494

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 2332b23..6698fc3 100644
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -34,10 +34,14 @@
 #include <widgets/modest-account-view.h>
 
 #include <modest-runtime.h>
+#include "modest-platform.h"
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
-#include "modest-account-assistant.h"
 #include "modest-tny-platform-factory.h"
+#include "easysetup/modest-easysetup-wizard-dialog.h"
+#include "modest-account-settings-dialog.h"
+#include <modest-utils.h>
+#include "widgets/modest-ui-constants.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -53,17 +57,18 @@ enum {
 
 typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate;
 struct _ModestAccountViewWindowPrivate {
-	GtkWidget           *add_button;
+	GtkWidget           *new_button;
 	GtkWidget           *edit_button;
-	GtkWidget           *remove_button;
-	GtkWidget	    *default_button;
+	GtkWidget           *delete_button;
+	GtkWidget	    *close_button;
 	ModestAccountView   *account_view;
+	guint acc_removed_handler;
 };
 #define MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                         MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \
                                                         ModestAccountViewWindowPrivate))
 /* globals */
-static GtkWindowClass *parent_class = NULL;
+static GtkDialogClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
 /* static guint signals[LAST_SIGNAL] = {0}; */
@@ -85,7 +90,7 @@ modest_account_view_window_get_type (void)
 			(GInstanceInitFunc) modest_account_view_window_init,
 			NULL
 		};
-		my_type = g_type_register_static (GTK_TYPE_WINDOW,
+		my_type = g_type_register_static (GTK_TYPE_DIALOG,
 		                                  "ModestAccountViewWindow",
 		                                  &my_info, 0);
 	}
@@ -102,25 +107,22 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass)
 	gobject_class->finalize = modest_account_view_window_finalize;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestAccountViewWindowPrivate));
-
-	/* signal definitions go here, e.g.: */
-/* 	signals[MY_SIGNAL_1] = */
-/* 		g_signal_new ("my_signal_1",....); */
-/* 	signals[MY_SIGNAL_2] = */
-/* 		g_signal_new ("my_signal_2",....); */
-/* 	etc. */
 }
 
 static void
-modest_account_view_window_init (ModestAccountViewWindow *obj)
+modest_account_view_window_finalize (GObject *self)
 {
-	/* empty */
-}
+	ModestAccountViewWindowPrivate *priv;
+	ModestAccountMgr *mgr;
+	
+	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
+	mgr = modest_runtime_get_account_mgr ();
 
-static void
-modest_account_view_window_finalize (GObject *obj)
-{
-	G_OBJECT_CLASS(parent_class)->finalize (obj);
+	if (g_signal_handler_is_connected (mgr, priv->acc_removed_handler))
+		g_signal_handler_disconnect (mgr, priv->acc_removed_handler);
+	priv->acc_removed_handler = 0;
+
+	G_OBJECT_CLASS(parent_class)->finalize (self);
 }
 
 
@@ -129,228 +131,404 @@ on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
 {
 	ModestAccountViewWindowPrivate *priv;
 	GtkTreeModel                   *model;
-	GtkTreeIter                    iter;
-	gboolean                       has_selection;
-	const gchar                   *account_name;
-	gchar                         *default_account_name;
+	GtkTreeIter                     iter;
+	gboolean                        has_selection;
 	
 	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->remove_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());
-	gtk_widget_set_sensitive (priv->default_button,
-				  default_account_name == NULL || account_name == NULL ||
-				  strcmp (default_account_name, account_name) != 0);
-	g_free (default_account_name);
+/** 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_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
+on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
 	ModestAccountViewWindowPrivate *priv;
 	ModestAccountMgr *account_mgr;
-	const gchar *account_name;
+	gchar *account_title = NULL, *account_name = NULL;
 	
 	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 
 	account_mgr = modest_runtime_get_account_mgr();	
 	account_name = modest_account_view_get_selected_account (priv->account_view);
+	if(!account_name)
+		return;
 
-	if (account_name) {
-		gboolean removed;
-		GtkWidget *dialog;
-		gchar *txt;
-
-		dialog = gtk_dialog_new_with_buttons (_("Confirmation dialog"),
-						      GTK_WINDOW (self),
-						      GTK_DIALOG_MODAL,
-						      GTK_STOCK_CANCEL,
-						      GTK_RESPONSE_REJECT,
-						      GTK_STOCK_OK,
-						      GTK_RESPONSE_ACCEPT,
-						      NULL);
-		txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name);
-		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));
+	account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
+	/* This could happen if the account is being deleted */
+	if (!account_title)
+		return;
+	
+	if (check_for_active_account (self, account_name)) {
+		/* The warning text depends on the account type: */
+		gchar *txt = NULL;	
+		gint response;
+		
+		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 {
+			txt = g_strdup_printf (_("emev_nc_delete_mailboximap"), 
+					       account_title);
+		}
+		
+		response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
 		g_free (txt);
+		txt = NULL;
+		
+		if (response == 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__);
+				}
 
-		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-			/* Remove account. If succeeded it removes also 
-			   the account from the ModestAccountView */
-			removed = modest_account_mgr_remove_account (account_mgr,
-								     account_name,
-								     FALSE);						 
-			if (removed) {
-				/* Show confirmation dialog ??? */
-			} else {
-				/* Show error dialog ??? */
-			}
 		}
-		gtk_widget_destroy (dialog);
-	}
+		g_free (account_title);
+	}		
+	g_free (account_name);
 }
 
 static void
-on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
+on_account_settings_dialog_response (GtkDialog *dialog,
+				     gint response,
+				     gpointer user_data)
 {
-	g_message (__FUNCTION__);
+	TnyAccount *store_account = NULL;
+	gchar* account_name = NULL;
+	ModestAccountViewWindowPrivate *priv = NULL;
+
+	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+	account_name = modest_account_view_get_selected_account (priv->account_view);
+	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);
+
+	/* Disconnect this handler */
+	g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
+
+	/* Free */
+	g_free (account_name);
 }
 
 static void
-on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
+on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-	GtkWidget *assistant;
-	ModestAccountViewWindowPrivate *priv;
+	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
 	
-	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-	/* FIXME */
-	g_warning (__FUNCTION__);
-	//assistant = modest_account_assistant_new (modest_runtime_get_account_mgr());
-	gtk_window_set_transient_for (GTK_WINDOW(assistant),
-				      GTK_WINDOW(self));
+	gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
+	if (!account_name)
+		return;
+		
+	/* Check whether any connections are active, and cancel them if 
+	 * the user wishes.
+	 */
+	if (check_for_active_account (self, account_name)) {
+		GtkWidget *dialog = modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
+		
+		/* When the dialog is closed, reconnect */
+		g_signal_connect (dialog, "response", 
+				  G_CALLBACK (on_account_settings_dialog_response), 
+				  self);
+	}
 	
-	gtk_widget_show (GTK_WIDGET(assistant));
+	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.
+	 */	 
+	if (dialog)
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+
+	/* Re-focus the account list view widget */
+	if (MODEST_IS_ACCOUNT_VIEW_WINDOW (user_data)) {
+		ModestAccountViewWindowPrivate *priv;
+		priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+		gtk_widget_grab_focus (GTK_WIDGET (priv->account_view));
+	}
+}
 
 static void
-on_default_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
+on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-	ModestAccountViewWindowPrivate *priv;
-	ModestAccountMgr *account_mgr;
-	const gchar *account_name;
+	GtkDialog *wizard;
+	GtkWindow *dialog;
+
+	/* Show the easy-setup wizard: */	
+	dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+	if (dialog && MODEST_IS_EASYSETUP_WIZARD_DIALOG(dialog)) {
+		/* old wizard is active already; 
+		 */
+		gtk_window_present (dialog);
+		return;
+	}
 	
-	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-	account_mgr = modest_runtime_get_account_mgr();	
-	account_name = modest_account_view_get_selected_account (priv->account_view);
-
-	modest_account_mgr_set_default_account (account_mgr, account_name);
+	/* there is no such wizard yet */
+	wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ());
+	modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), 
+				     GTK_WINDOW (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));
+	/* 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));
 }
 
 
-
 static void
-on_close_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
-{
-	gtk_widget_destroy (GTK_WIDGET(self));
-}
-
+on_close_button_clicked (GtkWidget *button, gpointer user_data)
+{		
+	ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
 
+	gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+}
 
 static GtkWidget*
 button_box_new (ModestAccountViewWindow *self)
 {
-
-	GtkWidget *button_box;
-	ModestAccountViewWindowPrivate *priv;
+	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 	
-	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-	
-	button_box   = gtk_vbutton_box_new ();
+	GtkWidget *button_box = gtk_hbutton_box_new ();
 	gtk_button_box_set_spacing (GTK_BUTTON_BOX (button_box), 6);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), 
 				   GTK_BUTTONBOX_START);
 	
-	priv->add_button     = gtk_button_new_from_stock(GTK_STOCK_ADD);
-	priv->default_button = gtk_button_new_with_label(_("Make default"));
-	priv->remove_button  = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
-	priv->edit_button    = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+	priv->new_button     = gtk_button_new_from_stock(_("mcen_bd_new"));
+	priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit"));
+	priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_delete"));
+	priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_close"));
 	
-	g_signal_connect (G_OBJECT(priv->add_button), "clicked",
-			  G_CALLBACK(on_add_button_clicked),
+	g_signal_connect (G_OBJECT(priv->new_button), "clicked",
+			  G_CALLBACK(on_new_button_clicked),
 			  self);
-	g_signal_connect (G_OBJECT(priv->remove_button), "clicked",
-			  G_CALLBACK(on_remove_button_clicked),
+	g_signal_connect (G_OBJECT(priv->delete_button), "clicked",
+			  G_CALLBACK(on_delete_button_clicked),
 			  self);
 	g_signal_connect (G_OBJECT(priv->edit_button), "clicked",
 			  G_CALLBACK(on_edit_button_clicked),
 			  self);
-	g_signal_connect (G_OBJECT(priv->default_button), "clicked",
-			  G_CALLBACK(on_default_button_clicked),
+	g_signal_connect (G_OBJECT(priv->close_button), "clicked",
+			  G_CALLBACK(on_close_button_clicked),
 			  self);
-	
-	gtk_box_pack_start (GTK_BOX(button_box), priv->add_button, FALSE, FALSE,2);
-	gtk_box_pack_start (GTK_BOX(button_box), priv->default_button, FALSE, FALSE,2);
-	gtk_box_pack_start (GTK_BOX(button_box), priv->remove_button, FALSE, FALSE,2);
+
+	gtk_box_pack_start (GTK_BOX(button_box), priv->new_button, FALSE, FALSE,2);
 	gtk_box_pack_start (GTK_BOX(button_box), priv->edit_button, FALSE, FALSE,2);
+	gtk_box_pack_start (GTK_BOX(button_box), priv->delete_button, FALSE, FALSE,2);
+	gtk_box_pack_start (GTK_BOX(button_box), priv->close_button, FALSE, FALSE,2);
+
+	/* Should has been created by window_vbox_new */
+	if (priv->account_view) {
+		GtkTreeSelection *sel;
+		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
+		if (gtk_tree_selection_count_selected_rows (sel) == 0) {
+			gtk_widget_set_sensitive (priv->edit_button, FALSE);
+			gtk_widget_set_sensitive (priv->delete_button, FALSE);	
+		}
+	}
 
-	gtk_widget_set_sensitive (priv->edit_button, FALSE);
-	gtk_widget_set_sensitive (priv->remove_button, FALSE);	
-	gtk_widget_set_sensitive (priv->default_button, FALSE);
-	
+	gtk_widget_show_all (button_box);
 	return button_box;
 }
 
-
 static GtkWidget*
 window_vbox_new (ModestAccountViewWindow *self)
 {
-	ModestAccountViewWindowPrivate *priv;
-	GtkTreeSelection *sel;
-	GtkWidget *main_hbox, *main_vbox, *button_box;
-	GtkWidget *close_button;
-	GtkWidget *close_hbox;
-
-	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
 
-	main_vbox     = gtk_vbox_new (FALSE, 6);
-	main_hbox     = gtk_hbox_new (FALSE, 6);
+	GtkWidget *main_vbox     = gtk_vbox_new (FALSE, 6);
+	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);
 
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
+	/* Only force the height, the width of the widget will depend
+	   on the size of the column titles */
+	gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
+	gtk_widget_show (GTK_WIDGET (priv->account_view));
+
+	GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
 	g_signal_connect (G_OBJECT(sel), "changed",  G_CALLBACK(on_selection_changed),
 			  self);
+			  
+	GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, 
+		GTK_POLICY_AUTOMATIC);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view));
+	gtk_widget_show (GTK_WIDGET (scrolled_window));
 	
-	button_box = button_box_new (self);
+	gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(scrolled_window), TRUE, TRUE, 2);
 	
-	gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(priv->account_view), TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX(main_hbox), button_box, FALSE, FALSE,2);
-
 	gtk_box_pack_start (GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 2);
+	gtk_widget_show (GTK_WIDGET (main_hbox));
+	gtk_widget_show (GTK_WIDGET (main_vbox));
 
-	close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	g_signal_connect (G_OBJECT(close_button), "clicked",
-			  G_CALLBACK(on_close_button_clicked),
-			  self);
-	
-	close_hbox = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_end (GTK_BOX(close_hbox),
-			  close_button, FALSE, FALSE,2);
-	gtk_box_pack_end (GTK_BOX(main_vbox), close_hbox, FALSE, FALSE,2);
-
-	gtk_widget_show_all (main_vbox);
 	return main_vbox;
 }
 
 
+static void
+modest_account_view_window_init (ModestAccountViewWindow *self)
+{
+	ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+
+	priv->acc_removed_handler = 0;
+}
+
+static void
+on_account_removed (ModestAccountMgr *acc_mgr, 
+		    const gchar *account,
+		    gpointer user_data)
+{
+	ModestAccountViewWindowPrivate *priv;
+
+	/* If there is no account left then close the window */
+	if (!modest_account_mgr_has_accounts (acc_mgr, TRUE)) {
+		gboolean ret_value;
+		g_signal_emit_by_name (G_OBJECT (user_data), "delete-event", NULL, &ret_value);
+	} else {		
+		/* Re-focus the account list view widget */
+		priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
+		gtk_widget_grab_focus (GTK_WIDGET (priv->account_view));
+	}
+}
+
 GtkWidget*
 modest_account_view_window_new (void)
 {
-	GObject *obj;
+	GObject *self = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
 	ModestAccountViewWindowPrivate *priv;
+	ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr ();
+
+	/* Add widgets */
+	gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->vbox)), 
+			    window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self)), 
+			    TRUE, TRUE, 2);
 	
-	obj  = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
-	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
+	gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->action_area)), 
+			    button_box_new (MODEST_ACCOUNT_VIEW_WINDOW (self)), 
+			    TRUE, TRUE, 2);
+
+	gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup_accounts"));
 
-	gtk_window_set_resizable (GTK_WINDOW(obj), FALSE);
-	gtk_window_set_title (GTK_WINDOW(obj), _("Accounts"));
-	gtk_window_set_type_hint (GTK_WINDOW(obj), GDK_WINDOW_TYPE_HINT_DIALOG);
+	/* Connect signals */
+	priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+	priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed",
+						      G_CALLBACK (on_account_removed), self);
 	
-	gtk_window_set_modal (GTK_WINDOW(obj), TRUE);
-		
-	gtk_container_add (GTK_CONTAINER(obj),
-			   window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)));
-		
-	return GTK_WIDGET(obj);
+	return GTK_WIDGET (self);
 }