From 9f31ae4e29b72a85f41c886762533436c2618bb1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 5 May 2011 14:02:48 -0400 Subject: Simplify em_utils_folder_is_templates(). e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both URIs, so we can just hand it an 'email://' URI directly. --- mail/em-utils.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'mail') diff --git a/mail/em-utils.c b/mail/em-utils.c index c20649c782..1cb1d62492 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1036,15 +1036,10 @@ em_utils_folder_is_templates (CamelFolder *folder) /* XXX EIterator misuses const. */ account = (EAccount *) e_iterator_get (iterator); - if (account->templates_folder_uri) { - gchar *templates_uri; - - templates_uri = em_uri_to_camel ( - account->templates_folder_uri); + if (account->templates_folder_uri != NULL) is_templates = e_mail_folder_uri_equal ( - session, templates_uri, folder_uri); - g_free (templates_uri); - } + session, folder_uri, + account->templates_folder_uri); e_iterator_next (iterator); } -- cgit v1.2.3