diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 02:15:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 03:20:23 +0800 |
| commit | 4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a (patch) | |
| tree | dc3f6fbd3f2b959699ccff29f22b0e2d3aec609e | |
| parent | 3433cca045b1f59ec026d16790ff6c604edf3463 (diff) | |
| download | gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar.gz gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar.bz2 gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar.lz gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar.xz gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.tar.zst gsoc2013-evolution-4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a.zip | |
Simplify em_folder_tree_model_set_folder_info().
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-folder-tree-model.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index d2edb52bf0..c9a020e761 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -726,19 +726,17 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, if (si->account && (flags & CAMEL_FOLDER_TYPE_MASK) == 0) { if (!is_drafts && si->account->drafts_folder_uri) { - gchar *curi = em_uri_to_camel (si->account->drafts_folder_uri); is_drafts = e_mail_folder_uri_equal ( - CAMEL_SESSION (session), fi->uri, curi); - g_free (curi); + CAMEL_SESSION (session), fi->uri, + si->account->drafts_folder_uri); } if (si->account->sent_folder_uri) { - gchar *curi = em_uri_to_camel (si->account->sent_folder_uri); if (e_mail_folder_uri_equal ( - CAMEL_SESSION (session), fi->uri, curi)) { + CAMEL_SESSION (session), fi->uri, + si->account->sent_folder_uri)) { add_flags = CAMEL_FOLDER_TYPE_SENT; } - g_free (curi); } } |