aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-06 22:24:11 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:10 +0800
commitb5c7c656b60a3e676b9071efdc018b3966642231 (patch)
tree202096bf2bed8805e9dcf0bcf0bbc9a1b8db7615
parentd2afa4c1059c5e7adc370c9e284606ac9825854a (diff)
downloadgsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar.gz
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar.bz2
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar.lz
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar.xz
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.tar.zst
gsoc2013-evolution-b5c7c656b60a3e676b9071efdc018b3966642231.zip
Remove uid_cachename_hack().
It was building the old CamelStore path based on the URI. Gone before 0.11 my ass.
-rw-r--r--mail/mail-ops.c31
1 files changed, 7 insertions, 24 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index c20f8d7aff..340890c8eb 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -198,29 +198,6 @@ mail_filter_folder (EMailSession *session,
/* ********************************************************************** */
-/* Temporary workaround for various issues. Gone before 0.11 */
-static gchar *
-uid_cachename_hack (CamelStore *store)
-{
- CamelURL *url;
- gchar *encoded_url, *filename;
- const gchar *data_dir;
-
- url = camel_service_get_camel_url (CAMEL_SERVICE (store));
-
- encoded_url = g_strdup_printf ("%s%s%s@%s", url->user,
- url->authmech ? ";auth=" : "",
- url->authmech ? url->authmech : "",
- url->host);
- e_filename_make_safe (encoded_url);
-
- data_dir = mail_session_get_data_dir ();
- filename = g_build_filename (data_dir, "pop", encoded_url, "uid-cache", NULL);
- g_free (encoded_url);
-
- return filename;
-}
-
static gchar *
fetch_mail_desc (struct _fetch_mail_msg *m)
{
@@ -255,10 +232,16 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
* 'cause of the way fetch_mail_free works. */
CamelUIDCache *cache = NULL;
CamelStore *parent_store;
+ CamelService *service;
+ const gchar *data_dir;
gchar *cachename;
parent_store = camel_folder_get_parent_store (folder);
- cachename = uid_cachename_hack (parent_store);
+
+ service = CAMEL_SERVICE (parent_store);
+ data_dir = camel_service_get_user_data_dir (service);
+
+ cachename = g_build_filename (data_dir, "uid-cache", NULL);
cache = camel_uid_cache_new (cachename);
g_free (cachename);