aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-vfolder.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-10-22 01:26:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-10-25 00:03:54 +0800
commit56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6 (patch)
tree9d042f76db5acba2aaaed47b41c581a06a204883 /mail/mail-vfolder.c
parent8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff)
downloadgsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.gz
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.zst
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.zip
Adapt to CamelNetworkSettings changes.
Diffstat (limited to 'mail/mail-vfolder.c')
-rw-r--r--mail/mail-vfolder.c9
1 files changed, 2 insertions, 7 deletions
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";