diff options
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b5ef851b80..50c3e2dfb9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2005-07-21 Not Zed <NotZed@Ximian.com> + * em-folder-browser.c: reverted dobey's busted view->hide* menu + stuff. + * em-account-editor.c (emae_option_entry): if we get a null default, then set "" on the entry. (emae_option_entry): set the default value on the url if it diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 5f7fb96030..286c767e1a 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -691,7 +691,7 @@ emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_view_hide_read(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_view_hide_read(BonoboUIComponent *uid, void *data, const char *path) { EMFolderView *emfv = data; @@ -699,7 +699,7 @@ emfb_view_hide_read(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent } static void -emfb_view_show_selected(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_view_hide_selected(BonoboUIComponent *uid, void *data, const char *path) { EMFolderView *emfv = data; GPtrArray *uids; @@ -712,7 +712,7 @@ emfb_view_show_selected(BonoboUIComponent *uic, const char *path, Bonobo_UICompo } static void -emfb_view_show_all(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_view_show_all(BonoboUIComponent *uid, void *data, const char *path) { EMFolderView *emfv = data; @@ -782,12 +782,9 @@ static BonoboUIVerb emfb_verbs[] = { BONOBO_UI_UNSAFE_VERB ("FolderExpunge", emfb_folder_expunge), /* HideDeleted is a toggle */ BONOBO_UI_UNSAFE_VERB ("MessageMarkAllAsRead", emfb_mark_all_read), - /* - These are radio buttons now BONOBO_UI_UNSAFE_VERB ("ViewHideRead", emfb_view_hide_read), - BONOBO_UI_UNSAFE_VERB ("ViewShowSelected", emfb_view_show_selected), + BONOBO_UI_UNSAFE_VERB ("ViewHideSelected", emfb_view_hide_selected), BONOBO_UI_UNSAFE_VERB ("ViewShowAll", emfb_view_show_all), - */ /* ViewThreaded is a toggle */ BONOBO_UI_UNSAFE_VERB ("FolderCopy", emfb_folder_copy), @@ -825,7 +822,7 @@ static const EMFolderViewEnable emfb_enable_map[] = { { "FolderRename", EM_POPUP_SELECT_FOLDER }, { "MailPost", EM_POPUP_SELECT_FOLDER }, { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER }, - { "ViewShowSelected", EM_POPUP_SELECT_MANY }, + { "ViewHideSelected", EM_POPUP_SELECT_MANY }, { NULL }, }; @@ -1148,10 +1145,6 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) /* FIXME: Selection state */ - bonobo_ui_component_add_listener(uic, "ViewHideRead", emfb_view_hide_read, emfv); - bonobo_ui_component_add_listener(uic, "ViewShowSelected", emfb_view_show_selected, emfv); - bonobo_ui_component_add_listener(uic, "ViewShowAll", emfb_view_show_all, emfv); - /* FIXME: property menu customisation */ /*folder_browser_setup_property_menu (fb, fb->uicomp);*/ |