From aec33928b7b77fe64b0afdf13b5db126e7f5dfac Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Apr 2010 08:36:24 -0400 Subject: Adapt to Camel API changes. --- mail/mail-tools.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'mail/mail-tools.c') diff --git a/mail/mail-tools.c b/mail/mail-tools.c index d7cb5c6cca..e9470c9a63 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -385,18 +385,23 @@ mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids) gchar * mail_tools_folder_to_url (CamelFolder *folder) { + CamelStore *parent_store; + const gchar *full_name; CamelURL *url; gchar *out; g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL); - url = camel_url_copy(((CamelService *)folder->parent_store)->url); - if (((CamelService *)folder->parent_store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) { - camel_url_set_fragment(url, folder->full_name); + full_name = camel_folder_get_full_name (folder); + parent_store = camel_folder_get_parent_store (folder); + + url = camel_url_copy(((CamelService *)parent_store)->url); + if (((CamelService *)parent_store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) { + camel_url_set_fragment(url, full_name); } else { - gchar *name = g_alloca(strlen(folder->full_name)+2); + gchar *name = g_alloca(strlen(full_name)+2); - sprintf(name, "/%s", folder->full_name); + sprintf(name, "/%s", full_name); camel_url_set_path(url, name); } -- cgit v1.2.3