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 --- mail/em-folder-view.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mail/em-folder-view.c') diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index e9f798ca2d..6fdafc0dcf 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1958,8 +1958,7 @@ emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, void *data) if (url->path && url->path[0]) { /* ensures vfolder is running */ - if (!vfolder_loaded ()) - vfolder_load_storage (); + vfolder_load_storage (); addr = camel_internet_address_new (); camel_address_decode (CAMEL_ADDRESS (addr), url->path); @@ -1988,8 +1987,7 @@ emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, void *data) if (url->path && url->path[0]) { /* ensures vfolder is running */ - if (!vfolder_loaded ()) - vfolder_load_storage (); + vfolder_load_storage (); addr = camel_internet_address_new (); camel_address_decode (CAMEL_ADDRESS (addr), url->path); @@ -2021,8 +2019,7 @@ vfolder_type_current (EMFolderView *emfv, int type) if (uids->len == 1) { /* ensures vfolder is running */ - if (!vfolder_loaded ()) - vfolder_load_storage (); + vfolder_load_storage (); vfolder_type_uid (emfv->folder, (char *) uids->pdata[0], emfv->folder_uri, type); } -- cgit