diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-01-07 20:12:13 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-01-07 20:12:13 +0800 |
| commit | 39be7e3d9cc8d42b63ec88aecb7756440d0b96ae (patch) | |
| tree | 33486ea9292e8a64658e1c11daa201169087eed5 /mail/em-folder-browser.c | |
| parent | 8f3a968fc9e8fc309eace95ff760378875ebf6fd (diff) | |
| download | gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar.gz gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar.bz2 gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar.lz gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar.xz gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.tar.zst gsoc2013-evolution-39be7e3d9cc8d42b63ec88aecb7756440d0b96ae.zip | |
** Fix for bug #300336
2008-01-07 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'mail/em-folder-browser.c')
| -rw-r--r-- | mail/em-folder-browser.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 521f7df518..5b11c11a18 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -757,9 +757,14 @@ emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb) case ESB_SAVE: d(printf("Save vfolder\n")); if (efb->current_query) { - FilterRule *rule = vfolder_clone_rule(efb->current_query); + FilterRule *rule; char *name, *text; + /* ensures vfolder is running */ + if (!vfolder_loaded ()) + vfolder_load_storage (); + + rule = vfolder_clone_rule (efb->current_query); text = e_search_bar_get_text(esb); name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''"); g_free (text); |