aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/itip-formatter
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-12 10:08:12 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-13 01:59:00 +0800
commited45d23b84053e1c341db3eb5520311d314ca1ae (patch)
treec91d6e794d79d9f1fe443a69a327c58212ea3ae2 /plugins/itip-formatter
parent4118d671d44b71592f0e91abb63f2468baaa9318 (diff)
downloadgsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.tar.gz
gsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.tar.zst
gsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.zip
Remove mail_tools_folder_to_url().
Use camel_folder_get_uri() instead.
Diffstat (limited to 'plugins/itip-formatter')
-rw-r--r--plugins/itip-formatter/itip-formatter.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 2c95876bba..2c52241c54 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2236,14 +2236,14 @@ check_is_instance (icalcomponent *icalcomp)
static gboolean
in_proper_folder (CamelFolder *folder)
{
+ const gchar *folder_uri;
gboolean res = TRUE;
gint flags = 0;
- gchar *uri;
if (!folder)
return FALSE;
- uri = mail_tools_folder_to_url (folder);
+ folder_uri = camel_folder_get_uri (folder);
if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (),
folder, &flags)) {
@@ -2255,21 +2255,19 @@ in_proper_folder (CamelFolder *folder)
/* or any other virtual folder */
CAMEL_IS_VEE_FOLDER (folder) ||
/* or anything else except of sent, outbox or drafts folder */
- (!em_utils_folder_is_sent (folder, uri) &&
- !em_utils_folder_is_outbox (folder, uri) &&
- !em_utils_folder_is_drafts (folder, uri))
+ (!em_utils_folder_is_sent (folder, folder_uri) &&
+ !em_utils_folder_is_outbox (folder, folder_uri) &&
+ !em_utils_folder_is_drafts (folder, folder_uri))
));
} else {
/* cannot check for Inbox folder here */
res = (folder->folder_flags & (CAMEL_FOLDER_IS_TRASH | CAMEL_FOLDER_IS_JUNK)) == 0 && (
(CAMEL_IS_VEE_FOLDER (folder)) || (
- !em_utils_folder_is_sent (folder, uri) &&
- !em_utils_folder_is_outbox (folder, uri) &&
- !em_utils_folder_is_drafts (folder, uri)));
+ !em_utils_folder_is_sent (folder, folder_uri) &&
+ !em_utils_folder_is_outbox (folder, folder_uri) &&
+ !em_utils_folder_is_drafts (folder, folder_uri)));
}
- g_free (uri);
-
return res;
}