From 56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 21 Oct 2011 13:26:07 -0400
Subject: Adapt to CamelNetworkSettings changes.

---
 mail/mail-vfolder.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'mail/mail-vfolder.c')

diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index c1e451d04c..66438f57ed 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1089,9 +1089,8 @@ vfolder_load_storage (EMailBackend *backend)
 
 	CamelService *service;
 	const gchar *key;
-	const gchar *data_dir;
 	const gchar *config_dir;
-	gchar *user, *storeuri;
+	gchar *user;
 	EFilterRule *rule;
 	MailFolderCache *folder_cache;
 	EMailSession *session;
@@ -1112,15 +1111,13 @@ vfolder_load_storage (EMailBackend *backend)
 
 	G_UNLOCK (vfolder_hash);
 
-	data_dir = mail_session_get_data_dir ();
 	config_dir = mail_session_get_config_dir ();
 	session = e_mail_backend_get_session (backend);
 
 	/* first, create the vfolder store, and set it up */
-	storeuri = g_strdup_printf("vfolder:%s/vfolder", data_dir);
 	service = camel_session_add_service (
 		CAMEL_SESSION (session), "vfolder",
-		storeuri, CAMEL_PROVIDER_STORE, NULL);
+		"vfolder", CAMEL_PROVIDER_STORE, NULL);
 	if (service != NULL) {
 		camel_service_set_display_name (service, _("Search Folders"));
 		em_utils_connect_service_sync (service, NULL, NULL);
@@ -1174,8 +1171,6 @@ vfolder_load_storage (EMailBackend *backend)
 		}
 	}
 
-	g_free (storeuri);
-
 	/* reenable the feature if required */
 	client = gconf_client_get_default ();
 	key = "/apps/evolution/mail/display/enable_vfolders";
-- 
cgit v1.2.3