X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-view-window.c;h=869600ed5910b0d94c35de522952a80d748bf1d1;hb=0f867d147ccfb5326b9d4331dc54586591071c60;hp=4a14f065b6c688e1bce65e5cdc5c4046f8b7f50e;hpb=47392c0526c508419e6b0a2aa81e199e2d7da976;p=modest

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 4a14f06..869600e 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-ui-constants.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -179,9 +180,23 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 		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);						 
+									     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 {
@@ -292,6 +307,9 @@ window_vbox_new (ModestAccountViewWindow *self)
 			  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));