aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-tree-model.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-06 02:15:56 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:07 +0800
commit13559de0838d5bf42e534ca528ae8befe1b0fe80 (patch)
treea19f20452372149901bf9c161ac0dc73b318f59b /mail/em-folder-tree-model.c
parentd5d1b84135d21f739d074d174e28541fcd3a0fc8 (diff)
downloadgsoc2013-evolution-13559de0838d5bf42e534ca528ae8befe1b0fe80.tar.gz
gsoc2013-evolution-13559de0838d5bf42e534ca528ae8befe1b0fe80.tar.zst
gsoc2013-evolution-13559de0838d5bf42e534ca528ae8befe1b0fe80.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.
Diffstat (limited to 'mail/em-folder-tree-model.c')
-rw-r--r--mail/em-folder-tree-model.c10
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);
}
}