diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-09-06 18:33:49 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-09-06 18:33:49 +0800 |
| commit | c51b960295aeb8be1a9ba836579088dc8cb60808 (patch) | |
| tree | 3dd7b65da90d57cfe36c71485d9ae0b50bee3762 /capplet | |
| parent | 4035b6fe61fcc5e4e2f1949f658e9cf7f148d6d9 (diff) | |
| download | gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar.gz gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar.bz2 gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar.lz gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar.xz gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.tar.zst gsoc2013-evolution-c51b960295aeb8be1a9ba836579088dc8cb60808.zip | |
Bug #655564 - Express remembers settings of not finished account
Diffstat (limited to 'capplet')
| -rw-r--r-- | capplet/settings/mail-account-view.c | 8 | ||||
| -rw-r--r-- | 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 3e35276361..3617c6a866 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 47956cd782..dba46a804f 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 |