From d5d1b84135d21f739d074d174e28541fcd3a0fc8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 5 May 2011 14:07:33 -0400 Subject: Simplify em_utils_folder_is_sent(). 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 | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mail/em-utils.c b/mail/em-utils.c index 7efa1df32c..14a8706c21 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1144,17 +1144,12 @@ em_utils_folder_is_sent (CamelFolder *folder) EAccount *account; /* XXX EIterator misuses const. */ - account = (EAccount *)e_iterator_get (iterator); - - if (account->sent_folder_uri) { - gchar *sent_uri; + account = (EAccount *) e_iterator_get (iterator); - sent_uri = em_uri_to_camel ( - account->sent_folder_uri); + if (account->sent_folder_uri != NULL) is_sent = e_mail_folder_uri_equal ( - session, sent_uri, folder_uri); - g_free (sent_uri); - } + session, folder_uri, + account->sent_folder_uri); e_iterator_next (iterator); } -- cgit