From 4f1ecbb64b04048e1765f25e65799830316021d1 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Sun, 30 Jul 2000 03:21:16 +0000 Subject: Remove hack to pass the storage around. 2000-07-29 Not Zed * component-factory.c (create_view): Remove hack to pass the storage around. * folder-browser-factory.c (control_activate): Changed to call renamed vfolder editor. * mail-ops.c (vfolder_edit_vfolders): renamed from vfolder_edit, call new edit function. (vfolder_editor_clicked): Removed. (filter_druid_clicked): (filter_edit): Updated for api change. (real_fetch_mail): Fixed up for api change and fucked up indent. (filter_get_folder): callback for filter driver. * mail-vfolder.c: New file to manage virtual folders. svn path=/trunk/; revision=4417 --- mail/folder-browser-factory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mail/folder-browser-factory.c') diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 43820e96b7..f6ea1d3bd7 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -81,17 +81,17 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, GNOME_STOCK_PIXMAP_TRASH, 0, 0, expunge_folder, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Filter Druid ...", _("_Filter Druid ..."), + bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Filters ...", _("Mail _Filters ..."), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, 0, 0, filter_edit, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Virtual Folder Druid ...", _("_Virtual Folder Druid ..."), + bonobo_ui_handler_menu_new_item (uih, "/Tools/vFolder Editor ...", _("_vFolder Editor ..."), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, - 0, 0, vfolder_edit, folder_browser); + 0, 0, vfolder_edit_vfolders, folder_browser); bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Configuration ...", _("_Mail Configuration ..."), NULL, -1, @@ -139,8 +139,8 @@ control_deactivate (BonoboControl *control, BonoboUIHandler *uih, bonobo_ui_handler_menu_remove (uih, "/View/Threaded"); bonobo_ui_handler_menu_remove (uih, "/Actions/Mark all seen"); bonobo_ui_handler_menu_remove (uih, "/Actions/Expunge"); - bonobo_ui_handler_menu_remove (uih, "/Tools/Filter Druid ..."); - bonobo_ui_handler_menu_remove (uih, "/Tools/Virtual Folder Druid ..."); + bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Filters ..."); + bonobo_ui_handler_menu_remove (uih, "/Tools/vFolder Editor ..."); bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Configuration ..."); bonobo_ui_handler_menu_remove (uih, "/Tools/Forget Passwords"); bonobo_ui_handler_dock_remove (uih, toolbar_name); -- cgit