diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3b5f604c6f..e049b325af 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2004-05-25 Not Zed <NotZed@Ximian.com> + + * em-folder-view.c (emfv_popup_menu[]): disable add sender to + addressbook bar if it is also disabled. #58955. + 2004-05-24 Not Zed <NotZed@Ximian.com> * mail-account-gui.c (mail_account_gui_build_extra_conf): don't diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 4220cfe1f7..b2b6aad2ae 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -928,8 +928,8 @@ static EMPopupItem emfv_popup_menu[] = { { EM_POPUP_IMAGE, "60.label.00/00.label", N_("None"), G_CALLBACK(emfv_popup_label_clear) }, { EM_POPUP_BAR, "60.label.00/00.label.00" }, - { EM_POPUP_BAR, "70.emfv", NULL, NULL, NULL, NULL, EM_POPUP_SELECT_ONE }, - { EM_POPUP_ITEM, "70.emfv.00", N_("Add Sender to Address_book"), G_CALLBACK(emfv_popup_add_sender), NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_ADD_SENDER }, + { EM_POPUP_BAR, "70.emfv", NULL, NULL, NULL, NULL, EM_POPUP_SELECT_ADD_SENDER }, + { EM_POPUP_ITEM, "70.emfv.00", N_("Add Sender to Address_book"), G_CALLBACK(emfv_popup_add_sender), NULL, NULL, EM_POPUP_SELECT_ADD_SENDER }, { EM_POPUP_BAR, "80.emfv" }, { EM_POPUP_ITEM, "80.emfv.00", N_("Appl_y Filters"), G_CALLBACK(emfv_popup_apply_filters), NULL, "stock_mail-filters-apply" }, |