Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 12 deletions

diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index ea039ea..aae81a0 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -97,7 +97,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn();
         text_column.set_expand(true);
         Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf();
-        icon_renderer.follow_state = true;
         text_column.pack_start (icon_renderer, false);
         text_column.add_attribute(icon_renderer, "gicon", Columns.ICON);
         text_column.set_cell_data_func(icon_renderer, icon_renderer_function);
@@ -790,17 +789,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         store.set(iter, Columns.ICON, icon);
     }
     
-    private void load_branch_icons(Gtk.TreeIter iter) {
-        load_entry_icons(iter);
-        
-        Gtk.TreeIter child_iter;
-        if (store.iter_children(out child_iter, iter)) {
-            do {
-                load_branch_icons(child_iter);
-            } while (store.iter_next(ref child_iter));
-        }
-    }
-    
     private bool on_selection(Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path,
         bool path_currently_selected) {
         // only allow selection if a page is selectable