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/mail-component.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mail/mail-component.c') diff --git a/mail/mail-component.c b/mail/mail-component.c index e4e2cbb6c5..036ad0a667 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -368,6 +368,7 @@ static void mc_startup(MailComponent *mc) { static int started = 0; + GConfClient *gconf; if (started) return; @@ -375,7 +376,11 @@ mc_startup(MailComponent *mc) mc_setup_local_store(mc); load_accounts(mc, mail_config_get_accounts()); - vfolder_load_storage(); + + gconf = mail_config_get_gconf_client(); + + if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/enable_vfolders", NULL)) + vfolder_load_storage(); } static void -- cgit v1.2.3