[evolution/evolution-3-12] Newly created folders always marked as having subfolders

[Milan Crha <mcrha src gnome org>]

commit 2aae852c17863461cf525d95796e1cf45db02e9b
Author: Milan Crha <mcrha redhat com>
Date:   Thu Apr 17 14:42:48 2014 +0200

    Newly created folders always marked as having subfolders
    
    This corrects, a bit, a regression caused by commit b0106cc8, reported at
    https://bugzilla.gnome.org/show_bug.cgi?id=722698#c13

 mail/em-folder-tree-model.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 3597b6e..8bbceab 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -1429,10 +1429,9 @@ folder_tree_model_folder_subscribed_cb (CamelStore *store,
 
        gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent);
 
-       /* The CamelFolderInfo does not contain child information,
-        * so pass fully_loaded=FALSE to indicate it's incomplete. */
        em_folder_tree_model_set_folder_info (
-               EM_FOLDER_TREE_MODEL (model), &iter, store, fi, FALSE);
+               EM_FOLDER_TREE_MODEL (model), &iter, store, fi,
+               (fi->flags & (CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN)) != 0);
 }
 
 static void