From 39be7e3d9cc8d42b63ec88aecb7756440d0b96ae Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Jan 2008 12:12:13 +0000 Subject: ** Fix for bug #300336 2008-01-07 Milan Crha ** Fix for bug #300336 * plugins/groupwise-features/share-folder-common.c: (users_dialog_response): Ensure vfolder is running. * mail/mail-vfolder.h: (vfolder_loaded): * mail/mail-vfolder.c: (vfolder_loaded): New helper function. * mail/em-folder-utils.c: (emfu_popup_new_folder_response): * mail/mail-vfolder.c: (vfolder_gui_add_rule), (vfolder_gui_add_from_message), (vfolder_gui_add_from_address): * mail/em-folder-browser.c: (emfb_search_menu_activated): * mail/em-folder-view.c: (emp_uri_popup_vfolder_sender), (emp_uri_popup_vfolder_recipient), (vfolder_type_current): Ensure vfolder is running. * mail/mail-component.c: (mc_startup): Do not start vfolder when disabled by option '/apps/evolution/mail/display/enable_vfolders'. * mail/evolution-mail.schemas.in: Added schema for new option. * mail/mail-config.glade: * mail/em-mailer-prefs.h: * mail/em-mailer-prefs.c: Added checkbox for "Enable Search Folders" option. Note: if your schema failed to install, then the search folders will be hidden. Enable by hand then. svn path=/trunk/; revision=34775 --- mail/em-folder-utils.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mail/em-folder-utils.c') diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index a12b758f82..e32efee827 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -707,6 +707,10 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, int response, gpointer d if (CAMEL_IS_VEE_STORE(store)) { EMVFolderRule *rule; + /* ensures vfolder is running */ + if (!vfolder_loaded ()) + vfolder_load_storage (); + rule = em_vfolder_rule_new(); filter_rule_set_name((FilterRule *)rule, path); vfolder_gui_add_rule(rule); -- cgit v1.2.3