From 2c8a39550b614c5fb6d78c022448bae79ca686a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 5 Aug 2013 00:10:08 +0200 Subject: [PATCH] CamelIMAPXStore: Remove NOINFERIORS -> NOCHILDREN hack. CamelFolderListResponse already takes care of adding the implicit /HasNoChildren attribute when /NoInferiors is seen. --- camel/camel-imapx-store.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c index 55bd2cf..a2c1c8b 100644 --- a/camel/camel-imapx-store.c +++ b/camel/camel-imapx-store.c @@ -1021,11 +1021,6 @@ get_folder_info_offline (CamelStore *store, fi->flags = (fi->flags & CAMEL_FOLDER_TYPE_MASK) | (si->flags & ~CAMEL_FOLDER_TYPE_MASK); else fi->flags = si->flags; - /* HACK: some servers report noinferiors for all folders (uw-imapd) - * We just translate this into nochildren, and let the imap layer enforce - * it. See create folder */ - if (fi->flags & CAMEL_FOLDER_NOINFERIORS) - fi->flags = (fi->flags & ~CAMEL_FOLDER_NOINFERIORS) | CAMEL_FOLDER_NOCHILDREN; /* blah, this gets lost somewhere, i can't be bothered finding out why */ if (!g_ascii_strcasecmp (fi->full_name, "inbox")) { @@ -1117,14 +1112,6 @@ add_folder_to_summary (CamelIMAPXStore *imapx_store, imapx_store->summary, si)); } - /* HACK: Some servers report noinferiors for all folders (uw-imapd). - * We just translate this into nochildren, and let the imap - * layer enforce it. See create folder. */ - if (flags & CAMEL_FOLDER_NOINFERIORS) { - flags &= ~CAMEL_FOLDER_NOINFERIORS; - flags |= CAMEL_FOLDER_NOCHILDREN; - } - fi->flags |= flags; fi->total = -1; -- 2.7.4