[evolution] Bug #655564 - Express remembers settings of not finished account

[Milan Crha <mcrha src gnome org>]

commit c51b960295aeb8be1a9ba836579088dc8cb60808
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 6 12:33:49 2011 +0200

    Bug #655564 - Express remembers settings of not finished account

 capplet/settings/mail-account-view.c  |    8 ++++----
 capplet/settings/mail-capplet-shell.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 3e35276..3617c6a 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -719,8 +719,10 @@ mav_next_pressed (GtkButton *button,
 		tmp = mail_account_pages[mav->current_page].create_page (mav);
 		page->main = gtk_hbox_new (FALSE, 0);
 		gtk_widget_show (page->main);
-		gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0);
-		gtk_widget_show (tmp);
+		if (tmp) {
+			gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0);
+			gtk_widget_show (tmp);
+		}
 		gtk_box_pack_start ((GtkBox *) page->box, page->main, FALSE, FALSE, 3);
 
 		if (mav->priv->is_gmail) {
@@ -943,8 +945,6 @@ mav_construct_page (MailAccountView *view,
 		}
 		page->next = gtk_button_new ();
 		gtk_widget_set_can_default (page->next, TRUE);
-		g_signal_connect (page->next, "hierarchy-changed",
-				  G_CALLBACK (gtk_widget_grab_default), NULL);
 		gtk_container_add ((GtkContainer *) page->next, box);
 		gtk_widget_show_all (page->next);
 		g_signal_connect (page->next, "clicked", G_CALLBACK(mav_next_pressed), view);
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 47956cd..dba46a8 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -179,7 +179,7 @@ mail_capplet_shell_quit (MailCappletShell *shell)
 	if (priv->main_loop)
 		gtk_main_quit ();
 	else
-		gtk_widget_hide ((GtkWidget *) shell);
+		gtk_widget_destroy ((GtkWidget *) shell);
 }
 
 static void