From c4250b826cf2c6dc6d06e5b2dfbc0563da9fcafd Mon Sep 17 00:00:00 2001
From: Charles Lindsay <chaz@yorba.org>
Date: Fri, 1 Feb 2013 11:52:32 -0800
Subject: [PATCH] Fix assertion when gmail labels nest; fix #6304

We want to use the normal folder comparator by default, and the special
comparator only in the root level.
---
 src/client/models/folder-list.vala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/models/folder-list.vala b/src/client/models/folder-list.vala
index 47f06d62..d34db832 100644
--- a/src/client/models/folder-list.vala
+++ b/src/client/models/folder-list.vala
@@ -17,7 +17,7 @@ public class FolderList : Sidebar.Tree {
         
         public AccountBranch(Geary.Account account) {
             base(new Sidebar.Grouping(account.information.nickname, new ThemedIcon("emblem-mail")),
-                Sidebar.Branch.Options.NONE, special_folder_comparator);
+                Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator);
             
             this.account = account;
             user_folder_group = new Sidebar.Grouping("",
@@ -26,7 +26,7 @@ public class FolderList : Sidebar.Tree {
             
             account.information.notify["nickname"].connect(on_nicknamed_changed);
             
-            graft(get_root(), user_folder_group, normal_folder_comparator);
+            graft(get_root(), user_folder_group);
         }
         
         ~AccountBranch() {