From 8e8d332b85b56b98e1f7d8d977170403fe1a42d5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 24 Jan 2008 11:06:21 +0000 Subject: ** Part of bug #511488 2008-01-24 Milan Crha ** Part of bug #511488 * mail/mail-vfolder.h: * mail/mail-vfolder.c: (vfolder_loaded): Function dropped. * mail/mail-vfolder.c: (vfolder_load_storage): Allow to call this function more than once, but do load the storage only once. * mail/em-folder-utils.c: (emfu_popup_new_folder_response): * mail/mail-vfolder.c: (vfolder_edit), (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. * plugins/groupwise-features/share-folder-common.c: (users_dialog_response): The logic to check if vfolder is running has been changed, so reflect it here too. svn path=/trunk/; revision=34878 --- plugins/groupwise-features/ChangeLog | 7 +++++++ plugins/groupwise-features/share-folder-common.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index b11ca999c1..77d14ff61f 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,10 @@ +2008-01-24 Milan Crha + + ** Part of bug #511488 + + * share-folder-common.c: (users_dialog_response): The logic to check + if vfolder is running has been changed, so reflect it here too. + 2008-01-07 Milan Crha ** Fix for bug #300336 diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 9427788de3..36b2d15449 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -274,8 +274,7 @@ users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi) EMVFolderRule *rule; /* ensures vfolder is running */ - if (!vfolder_loaded ()) - vfolder_load_storage (); + vfolder_load_storage (); rule = em_vfolder_rule_new(); filter_rule_set_name((FilterRule *)rule, path); -- cgit v1.2.3