diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-account-gui.c | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3e2a731d0d..fcc60057df 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-08-19 Dan Winship <danw@ximian.com> + + * mail-account-gui.c (mail_account_gui_setup): source_type_changed + may try to change the transport optionmenu (incorrectly in this + case), so don't call gtk_option_menu_set_history on it until after + emitting "activate" on the source type menuitem. + 2002-08-09 Peter Williams <peterw@ximian.com> * subscribe-dialog.c: Change this into a GnomeApp so we get a diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 03eb632fd9..e5f1efc51f 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -1664,11 +1664,9 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top) /* set the menus on the optionmenus */ gtk_option_menu_remove_menu (gui->source.type); gtk_option_menu_set_menu (gui->source.type, stores); - gtk_option_menu_set_history (gui->source.type, hstore); gtk_option_menu_remove_menu (gui->transport.type); gtk_option_menu_set_menu (gui->transport.type, transports); - gtk_option_menu_set_history (gui->transport.type, htransport); /* Force the authmenus to the width of the widest element */ if (max_authname) { @@ -1694,11 +1692,15 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top) gtk_widget_show_all (top); } - if (fstore) + if (fstore) { gtk_signal_emit_by_name (GTK_OBJECT (fstore), "activate"); + gtk_option_menu_set_history (gui->source.type, hstore); + } - if (ftransport) + if (ftransport) { gtk_signal_emit_by_name (GTK_OBJECT (ftransport), "activate"); + gtk_option_menu_set_history (gui->transport.type, htransport); + } if (source_proto) { setup_service (&gui->source, gui->account->source); |