diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 4 | ||||
| -rw-r--r-- | mail/mail-config-druid.c | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5071f1608a..94dd1998c0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2002-06-04 Not Zed <NotZed@Ximian.com> + + * mail-accounts.c (mail_accounts_tab_construct): Duh, we want to + set the news_edit/delete buttons for the news page, not overwrite + the mail ones! That would've saved a bit of angst ... + + * mail-config-druid.c (extra_prepare): dont call build_extra_conf, + otherwise it blows away any settings with defaults. + 2002-06-04 Jeffrey Stedfast <fejj@ximian.com> * mail-account-gui.c (mail_account_gui_save): Write the signature diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 0868e5a883..19e27ff142 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -835,11 +835,11 @@ mail_accounts_tab_construct (MailAccountsTab *prefs) gtk_signal_connect (GTK_OBJECT (prefs->news_add), "clicked", news_add_clicked, prefs); - prefs->mail_edit = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsEdit")); + prefs->news_edit = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsEdit")); gtk_signal_connect (GTK_OBJECT (prefs->news_edit), "clicked", news_edit_clicked, prefs); - prefs->mail_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsDelete")); + prefs->news_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdNewsDelete")); gtk_signal_connect (GTK_OBJECT (prefs->news_delete), "clicked", news_delete_clicked, prefs); #endif /* ENABLE_NNTP */ diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 813343ce6b..389be8fba8 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -334,7 +334,6 @@ extra_prepare (EvolutionWizard *wizard, gpointer data) gui->page = MAIL_CONFIG_WIZARD_PAGE_EXTRA; if (gui->gui->source.provider != gui->last_source) { gui->last_source = gui->gui->source.provider; - mail_account_gui_build_extra_conf (gui->gui, NULL); mail_account_gui_auto_detect_extra_conf (gui->gui); } } |