diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 02:02:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 03:20:23 +0800 |
| commit | 6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e (patch) | |
| tree | be0bb5c453c710086fca140c09cd8ea51748b982 | |
| parent | 762fcc69529a4ce1822f4d978e2d4f85eef4cacc (diff) | |
| download | gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar.gz gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar.bz2 gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar.lz gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar.xz gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.tar.zst gsoc2013-evolution-6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e.zip | |
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.
| -rw-r--r-- | mail/em-utils.c | 11 |
1 files changed, 3 insertions, 8 deletions
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); } |