From 0fb08f3ff81575a4749d851404233f34252dd2f2 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 21 Oct 2003 18:28:34 +0000 Subject: Merge new-ui-branch to the trunk. svn path=/trunk/; revision=22964 --- mail/mail-ops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 65cc8676c1..8d3711ff4e 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -38,6 +38,7 @@ #include #include #include "mail.h" +#include "mail-component.h" #include "mail-tools.h" #include "mail-ops.h" #include "mail-vfolder.h" @@ -229,7 +230,8 @@ uid_cachename_hack (CamelStore *store) url->host); e_filename_make_safe (encoded_url); - filename = g_strdup_printf ("%s/mail/pop3/cache-%s", evolution_dir, encoded_url); + filename = g_strdup_printf ("%s/mail/pop3/cache-%s", + mail_component_peek_base_directory (mail_component_peek ()), encoded_url); /* lame hack, but we can't expect user's to actually migrate their cache files - brain power requirements are too @@ -238,7 +240,9 @@ uid_cachename_hack (CamelStore *store) /* This is either the first time the user has checked mail with this POP provider or else their cache file is in the old location... */ - old_location = g_strdup_printf ("%s/config/cache-%s", evolution_dir, encoded_url); + old_location = g_strdup_printf ("%s/config/cache-%s", + mail_component_peek_base_directory (mail_component_peek ()), + encoded_url); if (stat (old_location, &st) == -1) { /* old location doesn't exist either so use the new location */ g_free (old_location); -- cgit v1.2.3