Merge tag 'upstream/0.22.0'

Upstream version 0.22.0

1 files changed, 5 insertions, 13 deletions

diff --git a/src/folders/Branch.vala b/src/folders/Branch.vala
index bc5b578..0904e5c 100644
--- a/src/folders/Branch.vala
+++ b/src/folders/Branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2014 Yorba Foundation
+/* Copyright 2012-2015 Yorba Foundation
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -136,9 +136,9 @@ public class Folders.Branch : Sidebar.Branch {
     }
 }
 
-private class Folders.Root : Sidebar.Grouping {
+private class Folders.Root : Sidebar.Header {
     public Root() {
-        base (_("Folders"), Folders.opened_icon, Folders.closed_icon);
+        base (_("Folders"));
     }
 }
 
@@ -172,22 +172,14 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE
         return dir.get_basename();
     }
     
-    public override Icon? get_sidebar_icon() {
-        return count == 0 ? closed_icon : have_photos_icon;
+    public override string? get_sidebar_icon() {
+        return count == 0 ? icon : have_photos_icon;
     }
     
     public override string to_string() {
         return dir.get_path();
     }
     
-    public Icon? get_sidebar_open_icon() {
-        return count == 0 ? opened_icon : have_photos_icon;
-    }
-    
-    public Icon? get_sidebar_closed_icon() {
-        return count == 0 ? closed_icon : have_photos_icon;
-    }
-    
     public bool expand_on_select() {
         return true;
     }