New upstream version 0.28.3upstream/0.28.3

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-06-25 20:55:59 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-06-25 20:55:59 +0200
commit: ab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch)
tree: 64961342a79003ee865b3f9f8f41f99f09f37a2e /src/sidebar
parent: 49120f48474fc8fdc2448c75d961bc238213cfac (diff)
5 files changed, 4590 insertions, 4470 deletions
diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c
index a49cdac..e855a99 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
+/* Branch.c generated by valac 0.40.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -56,6 +57,11 @@ typedef struct _SidebarEntryIface SidebarEntryIface;
 
 typedef struct _SidebarTree SidebarTree;
 typedef struct _SidebarTreeClass SidebarTreeClass;
+enum  {
+	SIDEBAR_BRANCH_0_PROPERTY,
+	SIDEBAR_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_branch_properties[SIDEBAR_BRANCH_NUM_PROPERTIES];
 #define _sidebar_branch_node_unref0(var) ((var == NULL) ? NULL : (var = (sidebar_branch_node_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _SidebarBranchNodePrivate SidebarBranchNodePrivate;
@@ -67,9 +73,9 @@ enum  {
 	SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL,
 	SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL,
 	SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL,
-	SIDEBAR_BRANCH_LAST_SIGNAL
+	SIDEBAR_BRANCH_NUM_SIGNALS
 };
-static guint sidebar_branch_signals[SIDEBAR_BRANCH_LAST_SIGNAL] = {0};
+static guint sidebar_branch_signals[SIDEBAR_BRANCH_NUM_SIGNALS] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -139,110 +145,180 @@ static gpointer sidebar_branch_node_parent_class = NULL;
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 static gpointer sidebar_branch_node_ref (gpointer instance);
 static void sidebar_branch_node_unref (gpointer instance);
-static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* sidebar_branch_param_spec_node (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags) G_GNUC_UNUSED;
+static void sidebar_branch_value_set_node (GValue* value,
+                                    gpointer v_object) G_GNUC_UNUSED;
+static void sidebar_branch_value_take_node (GValue* value,
+                                     gpointer v_object) G_GNUC_UNUSED;
 static gpointer sidebar_branch_value_get_node (const GValue* value) G_GNUC_UNUSED;
 static GType sidebar_branch_node_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_BRANCH, SidebarBranchPrivate))
-enum  {
-	SIDEBAR_BRANCH_DUMMY_PROPERTY
-};
 gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator);
-static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator);
-void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+                                   SidebarBranchOptions options,
+                                   GCompareFunc default_comparator,
+                                   GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+                                         SidebarEntry* root,
+                                         SidebarBranchOptions options,
+                                         GCompareFunc default_comparator,
+                                         GCompareFunc root_comparator);
+static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry,
+                                            SidebarBranchNode* parent,
+                                            GCompareFunc comparator);
+static SidebarBranchNode* sidebar_branch_node_construct (GType object_type,
+                                                  SidebarEntry* entry,
+                                                  SidebarBranchNode* parent,
+                                                  GCompareFunc comparator);
+void sidebar_branch_set_show_branch (SidebarBranch* self,
+                                     gboolean shown);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 gboolean sidebar_branch_get_show_branch (SidebarBranch* self);
 gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self);
 gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self);
 gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
-static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target);
-static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node);
-static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self);
-static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child);
+void sidebar_branch_graft (SidebarBranch* self,
+                           SidebarEntry* parent,
+                           SidebarEntry* entry,
+                           GCompareFunc comparator);
+static void sidebar_branch_node_add_child (SidebarBranchNode* self,
+                                    SidebarBranchNode* child);
+void sidebar_branch_prune (SidebarBranch* self,
+                           SidebarEntry* entry);
+static void sidebar_branch_node_prune_children (SidebarBranchNode* self,
+                                         SidebarBranchNodePruneCallback cb,
+                                         void* cb_target);
+static void sidebar_branch_prune_callback (SidebarBranch* self,
+                                    SidebarBranchNode* node);
+static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node,
+                                                                        gpointer self);
+static void sidebar_branch_node_remove_child (SidebarBranchNode* self,
+                                       SidebarBranchNode* child);
 static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self);
-void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry);
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry);
-static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child);
+void sidebar_branch_reparent (SidebarBranch* self,
+                              SidebarEntry* new_parent,
+                              SidebarEntry* entry);
+gboolean sidebar_branch_has_entry (SidebarBranch* self,
+                                   SidebarEntry* entry);
+void sidebar_branch_reorder (SidebarBranch* self,
+                             SidebarEntry* entry);
+static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self,
+                                            SidebarBranchNode* child);
 void sidebar_branch_reorder_all (SidebarBranch* self);
-static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target);
-static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node);
-static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self);
-void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive);
-void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator);
-static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target);
-void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator);
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
-GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent);
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
-SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry);
-SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum  {
-	SIDEBAR_BRANCH_NODE_DUMMY_PROPERTY
-};
-static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode);
-static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child);
+static void sidebar_branch_node_reorder_children (SidebarBranchNode* self,
+                                           gboolean recursive,
+                                           SidebarBranchNodeChildrenReorderedCallback cb,
+                                           void* cb_target);
+static void sidebar_branch_children_reordered_callback (SidebarBranch* self,
+                                                 SidebarBranchNode* node);
+static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node,
+                                                                                                  gpointer self);
+void sidebar_branch_reorder_children (SidebarBranch* self,
+                                      SidebarEntry* entry,
+                                      gboolean recursive);
+void sidebar_branch_change_all_comparators (SidebarBranch* self,
+                                            GCompareFunc comparator);
+static void sidebar_branch_node_change_comparator (SidebarBranchNode* self,
+                                            GCompareFunc comparator,
+                                            gboolean recursive,
+                                            SidebarBranchNodeChildrenReorderedCallback cb,
+                                            void* cb_target);
+void sidebar_branch_change_comparator (SidebarBranch* self,
+                                       SidebarEntry* entry,
+                                       gboolean recursive,
+                                       GCompareFunc comparator);
+gint sidebar_branch_get_child_count (SidebarBranch* self,
+                                     SidebarEntry* parent);
+GeeList* sidebar_branch_get_children (SidebarBranch* self,
+                                      SidebarEntry* parent);
+SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self,
+                                               SidebarEntry* parent,
+                                               Locator locator,
+                                               void* locator_target);
+SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self,
+                                         SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self,
+                                                   SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self,
+                                               SidebarEntry* entry);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
+static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode,
+                                             SidebarBranchNode* bnode);
+static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a,
+                                                                 gconstpointer b,
+                                                                 gpointer self);
+static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
+                                                SidebarBranchNode* child);
 static void sidebar_branch_node_finalize (SidebarBranchNode * obj);
 static void sidebar_branch_finalize (GObject * obj);
 
 
-gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY) != 0;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 212 "Branch.c"
+#line 280 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) != 0;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 222 "Branch.c"
+#line 292 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD) != 0;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 232 "Branch.c"
+#line 304 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING) != 0;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 242 "Branch.c"
+#line 316 "Branch.c"
 }
 
 
-GType sidebar_branch_options_get_type (void) {
+GType
+sidebar_branch_options_get_type (void)
+{
 	static volatile gsize sidebar_branch_options_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_options_type_id__volatile)) {
 		static const GFlagsValue values[] = {{SIDEBAR_BRANCH_OPTIONS_NONE, "SIDEBAR_BRANCH_OPTIONS_NONE", "none"}, {SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, "SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY", "hide-if-empty"}, {SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, "SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD", "auto-open-on-new-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, "SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD", "startup-expand-to-first-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, "SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING", "startup-open-grouping"}, {0, NULL, NULL}};
@@ -254,97 +330,84 @@ GType sidebar_branch_options_get_type (void) {
 }
 
 
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
+SidebarBranch*
+sidebar_branch_construct (GType object_type,
+                          SidebarEntry* root,
+                          SidebarBranchOptions options,
+                          GCompareFunc default_comparator,
+                          GCompareFunc root_comparator)
+{
 	SidebarBranch * self = NULL;
-	GCompareFunc _tmp0_;
-	GCompareFunc _tmp1_ = NULL;
-	GCompareFunc _tmp2_;
-	SidebarEntry* _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	SidebarBranchOptions _tmp7_;
-	GeeHashMap* _tmp8_;
-	SidebarEntry* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarBranchOptions _tmp11_;
-	gboolean _tmp12_;
+	GCompareFunc _tmp0_ = NULL;
+	SidebarBranchNode* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SidebarBranchNode* _tmp3_;
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = (SidebarBranch*) g_object_new (object_type, NULL);
 #line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = default_comparator;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->default_comparator = _tmp0_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = root_comparator;
+	self->priv->default_comparator = default_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_ != NULL) {
-#line 283 "Branch.c"
-		GCompareFunc _tmp3_;
+	if (root_comparator != NULL) {
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp3_ = root_comparator;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp1_ = _tmp3_;
-#line 289 "Branch.c"
+		_tmp0_ = root_comparator;
+#line 356 "Branch.c"
 	} else {
-		GCompareFunc _tmp4_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = default_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp1_ = _tmp4_;
-#line 296 "Branch.c"
+		_tmp0_ = default_comparator;
+#line 360 "Branch.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = root;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = sidebar_branch_node_new (_tmp5_, NULL, _tmp1_);
+	_tmp1_ = sidebar_branch_node_new (root, NULL, _tmp0_);
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (self->priv->root);
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->root = _tmp6_;
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = options;
+	self->priv->root = _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->options = _tmp7_;
+	self->priv->options = options;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = self->priv->map;
+	_tmp2_ = self->priv->map;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = root;
+	_tmp3_ = self->priv->root;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = self->priv->root;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = options;
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), root, _tmp3_);
 #line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = sidebar_branch_options_is_hide_if_empty (_tmp11_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_) {
+	if (sidebar_branch_options_is_hide_if_empty (options)) {
 #line 216 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 326 "Branch.c"
+#line 380 "Branch.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 330 "Branch.c"
+#line 384 "Branch.c"
 }
 
 
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
+SidebarBranch*
+sidebar_branch_new (SidebarEntry* root,
+                    SidebarBranchOptions options,
+                    GCompareFunc default_comparator,
+                    GCompareFunc root_comparator)
+{
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_construct (SIDEBAR_TYPE_BRANCH, root, options, default_comparator, root_comparator);
-#line 337 "Branch.c"
+#line 396 "Branch.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 344 "Branch.c"
+#line 405 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
+SidebarEntry*
+sidebar_branch_get_root (SidebarBranch* self)
+{
 	SidebarEntry* result = NULL;
 	SidebarBranchNode* _tmp0_;
 	SidebarEntry* _tmp1_;
@@ -361,40 +424,36 @@ SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
 	result = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 365 "Branch.c"
+#line 428 "Branch.c"
 }
 
 
-void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) {
+void
+sidebar_branch_set_show_branch (SidebarBranch* self,
+                                gboolean shown)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 223 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->shown;
 #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = shown;
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (_tmp0_ == shown) {
 #line 225 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 384 "Branch.c"
+#line 445 "Branch.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = shown;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->shown = _tmp2_;
+	self->priv->shown = shown;
 #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = shown;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, _tmp3_);
-#line 394 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, shown);
+#line 451 "Branch.c"
 }
 
 
-gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
+gboolean
+sidebar_branch_get_show_branch (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -405,87 +464,79 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
 	result = _tmp0_;
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 409 "Branch.c"
+#line 468 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_);
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 427 "Branch.c"
+#line 485 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_);
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 445 "Branch.c"
+#line 502 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_startup_open_grouping (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_startup_open_grouping (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_startup_open_grouping (_tmp0_);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 463 "Branch.c"
+#line 519 "Branch.c"
 }
 
 
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator) {
+void
+sidebar_branch_graft (SidebarBranch* self,
+                      SidebarEntry* parent,
+                      SidebarEntry* entry,
+                      GCompareFunc comparator)
+{
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
-	SidebarBranchOptions _tmp6_;
-	gboolean _tmp7_;
+	GeeHashMap* _tmp1_;
+	SidebarBranchOptions _tmp2_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp8_;
-	SidebarEntry* _tmp9_;
-	gpointer _tmp10_;
-	GCompareFunc _tmp11_ = NULL;
-	GCompareFunc _tmp12_;
+	GeeHashMap* _tmp3_;
+	gpointer _tmp4_;
+	GCompareFunc _tmp5_ = NULL;
 	SidebarBranchNode* entry_node = NULL;
-	SidebarEntry* _tmp15_;
-	SidebarBranchNode* _tmp16_;
-	SidebarBranchNode* _tmp17_;
-	SidebarBranchNode* _tmp18_;
-	GeeHashMap* _tmp19_;
-	SidebarEntry* _tmp20_;
-	SidebarEntry* _tmp21_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	GeeHashMap* _tmp10_;
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -495,239 +546,193 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
-#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp2_, "map.has_key(parent)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)");
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp1_ = self->priv->map;
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (!_tmp5_, "!map.has_key(entry)");
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->options;
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "!map.has_key(entry)");
 #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = sidebar_branch_options_is_hide_if_empty (_tmp6_);
+	_tmp2_ = self->priv->options;
 #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp7_) {
+	if (sidebar_branch_options_is_hide_if_empty (_tmp2_)) {
 #line 253 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, TRUE);
-#line 520 "Branch.c"
+#line 561 "Branch.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = self->priv->map;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = parent;
+	_tmp3_ = self->priv->map;
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
+	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp10_;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = comparator;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_ != NULL) {
-#line 534 "Branch.c"
-		GCompareFunc _tmp13_;
+	parent_node = (SidebarBranchNode*) _tmp4_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp13_ = comparator;
+	if (comparator != NULL) {
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = _tmp13_;
-#line 540 "Branch.c"
+		_tmp5_ = comparator;
+#line 573 "Branch.c"
 	} else {
-		GCompareFunc _tmp14_;
+		GCompareFunc _tmp6_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp14_ = self->priv->default_comparator;
+		_tmp6_ = self->priv->default_comparator;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = _tmp14_;
-#line 547 "Branch.c"
+		_tmp5_ = _tmp6_;
+#line 580 "Branch.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry;
+	_tmp7_ = parent_node;
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = parent_node;
+	_tmp8_ = sidebar_branch_node_new (entry, _tmp7_, _tmp5_);
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = sidebar_branch_node_new (_tmp15_, _tmp16_, _tmp11_);
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = _tmp17_;
+	entry_node = _tmp8_;
 #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = parent_node;
+	_tmp9_ = parent_node;
 #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_add_child (_tmp18_, entry_node);
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = self->priv->map;
+	sidebar_branch_node_add_child (_tmp9_, entry_node);
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp20_ = entry;
+	_tmp10_ = self->priv->map;
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, entry_node);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, entry_node);
 #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = entry;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, _tmp21_);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, entry);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (parent_node);
-#line 575 "Branch.c"
+#line 602 "Branch.c"
 }
 
 
-static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self) {
+static void
+_sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node,
+                                                                   gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_prune_callback ((SidebarBranch*) self, node);
-#line 582 "Branch.c"
+#line 612 "Branch.c"
 }
 
 
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
+void
+sidebar_branch_prune (SidebarBranch* self,
+                      SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp6_;
-	SidebarEntry* _tmp7_;
-	gpointer _tmp8_;
+	GeeHashMap* _tmp3_;
+	gpointer _tmp4_;
+	SidebarBranchNode* _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
 	SidebarBranchNode* _tmp9_;
 	SidebarBranchNode* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	SidebarBranchNode* _tmp12_;
-	SidebarBranchNode* _tmp13_;
-	SidebarBranchNode* _tmp14_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp15_;
-	SidebarEntry* _tmp16_;
-	gboolean _tmp17_;
-	gboolean _tmp18_;
-	SidebarEntry* _tmp19_;
-	gboolean _tmp20_ = FALSE;
-	SidebarBranchOptions _tmp21_;
-	gboolean _tmp22_;
+	GeeHashMap* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_ = FALSE;
+	SidebarBranchOptions _tmp15_;
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = self->priv->map;
 #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp5_, "map.has_key(entry)");
-#line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->map;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)");
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry;
+	_tmp3_ = self->priv->map;
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
+	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp8_;
+	entry_node = (SidebarBranchNode*) _tmp4_;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp5_ = entry_node;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_prune_children (_tmp9_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self);
+	sidebar_branch_node_prune_children (_tmp5_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self);
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = entry_node;
+	_tmp6_ = entry_node;
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->parent;
+	_tmp7_ = _tmp6_->parent;
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp7_ != NULL, "entry_node.parent != null");
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp8_ = entry_node;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp9_ = _tmp8_->parent;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = entry_node;
+	_tmp10_ = entry_node;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_remove_child (_tmp13_, _tmp14_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = self->priv->map;
+	sidebar_branch_node_remove_child (_tmp9_, _tmp10_);
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = entry;
+	_tmp11_ = self->priv->map;
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, NULL);
+	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	removed = _tmp17_;
+	removed = _tmp12_;
 #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = removed;
+	_tmp13_ = removed;
 #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp18_, "removed");
+	_vala_assert (_tmp13_, "removed");
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = entry;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp19_);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = self->priv->options;
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, entry);
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp22_ = sidebar_branch_options_is_hide_if_empty (_tmp21_);
+	_tmp15_ = self->priv->options;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp22_) {
-#line 680 "Branch.c"
-		SidebarBranchNode* _tmp23_;
-		gboolean _tmp24_;
+	if (sidebar_branch_options_is_hide_if_empty (_tmp15_)) {
+#line 692 "Branch.c"
+		SidebarBranchNode* _tmp16_;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp23_ = self->priv->root;
+		_tmp16_ = self->priv->root;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp24_ = sidebar_branch_node_has_children (_tmp23_);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = !_tmp24_;
-#line 689 "Branch.c"
+		_tmp14_ = !sidebar_branch_node_has_children (_tmp16_);
+#line 698 "Branch.c"
 	} else {
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = FALSE;
-#line 693 "Branch.c"
+		_tmp14_ = FALSE;
+#line 702 "Branch.c"
 	}
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp20_) {
+	if (_tmp14_) {
 #line 283 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 699 "Branch.c"
+#line 708 "Branch.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 703 "Branch.c"
+#line 712 "Branch.c"
 }
 
 
-void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+void
+sidebar_branch_reparent (SidebarBranch* self,
+                         SidebarEntry* new_parent,
+                         SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
 	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
-	GeeHashMap* _tmp6_;
-	SidebarEntry* _tmp7_;
-	gboolean _tmp8_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp9_;
-	SidebarEntry* _tmp10_;
-	gpointer _tmp11_;
+	GeeHashMap* _tmp4_;
+	gpointer _tmp5_;
 	SidebarBranchNode* new_parent_node = NULL;
-	GeeHashMap* _tmp12_;
-	SidebarEntry* _tmp13_;
-	gpointer _tmp14_;
-	SidebarBranchNode* _tmp15_;
+	GeeHashMap* _tmp6_;
+	gpointer _tmp7_;
+	SidebarBranchNode* _tmp8_;
 	SidebarEntry* old_parent = NULL;
-	SidebarBranchNode* _tmp16_;
-	SidebarEntry* _tmp17_;
-	SidebarEntry* _tmp18_;
-	SidebarBranchNode* _tmp19_;
-	SidebarEntry* _tmp20_;
+	SidebarBranchNode* _tmp9_;
+	SidebarEntry* _tmp10_;
+	SidebarEntry* _tmp11_;
+	SidebarBranchNode* _tmp12_;
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -735,83 +740,69 @@ void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, Sid
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = self->priv->map;
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp5_, "map.has_key(entry)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)");
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->map;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = new_parent;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
+	_tmp3_ = self->priv->map;
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_, "map.has_key(new_parent)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent), "map.has_key(new_parent)");
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = self->priv->map;
+	_tmp4_ = self->priv->map;
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = entry;
+	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp11_;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = self->priv->map;
+	entry_node = (SidebarBranchNode*) _tmp5_;
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = new_parent;
+	_tmp6_ = self->priv->map;
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
+	_tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent);
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_parent_node = (SidebarBranchNode*) _tmp14_;
+	new_parent_node = (SidebarBranchNode*) _tmp7_;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node->parent;
+	_tmp8_ = entry_node->parent;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp15_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = entry_node->parent;
+	_tmp9_ = entry_node->parent;
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = _tmp16_->entry;
+	_tmp10_ = _tmp9_->entry;
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = _g_object_ref0 (_tmp17_);
+	_tmp11_ = _g_object_ref0 (_tmp10_);
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_parent = _tmp18_;
+	old_parent = _tmp11_;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = entry_node->parent;
+	_tmp12_ = entry_node->parent;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_remove_child (_tmp19_, entry_node);
+	sidebar_branch_node_remove_child (_tmp12_, entry_node);
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_add_child (new_parent_node, entry_node);
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp20_ = entry;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, _tmp20_, old_parent);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, entry, old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (new_parent_node);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 806 "Branch.c"
+#line 795 "Branch.c"
 }
 
 
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
+gboolean
+sidebar_branch_has_entry (SidebarBranch* self,
+                          SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	SidebarBranchNode* _tmp1_;
 	SidebarEntry* _tmp2_;
-	SidebarEntry* _tmp3_;
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -821,111 +812,98 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp2_ = _tmp1_->entry;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = entry;
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_ == _tmp3_) {
+	if (_tmp2_ == entry) {
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = TRUE;
-#line 830 "Branch.c"
+#line 819 "Branch.c"
 	} else {
-		GeeHashMap* _tmp4_;
-		SidebarEntry* _tmp5_;
-		gboolean _tmp6_;
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = self->priv->map;
+		GeeHashMap* _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp5_ = entry;
+		_tmp3_ = self->priv->map;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp0_ = _tmp6_;
-#line 843 "Branch.c"
+		_tmp0_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
+#line 826 "Branch.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 849 "Branch.c"
+#line 832 "Branch.c"
 }
 
 
-void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+void
+sidebar_branch_reorder (SidebarBranch* self,
+                        SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
 	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	gboolean _tmp12_;
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp7_ = entry_node;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = entry_node;
+	_tmp8_ = _tmp7_->parent;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = sidebar_branch_node_reorder_child (_tmp10_, _tmp11_);
+	_tmp9_ = entry_node;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_) {
-#line 908 "Branch.c"
-		SidebarEntry* _tmp13_;
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp13_ = entry;
+	if (sidebar_branch_node_reorder_child (_tmp8_, _tmp9_)) {
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, _tmp13_);
-#line 914 "Branch.c"
+		g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, entry);
+#line 887 "Branch.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 918 "Branch.c"
+#line 891 "Branch.c"
 }
 
 
-static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self) {
+static void
+_sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node,
+                                                                                             gpointer self)
+{
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_children_reordered_callback ((SidebarBranch*) self, node);
-#line 925 "Branch.c"
+#line 901 "Branch.c"
 }
 
 
-void sidebar_branch_reorder_all (SidebarBranch* self) {
+void
+sidebar_branch_reorder_all (SidebarBranch* self)
+{
 	SidebarBranchNode* _tmp0_;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
@@ -933,16 +911,18 @@ void sidebar_branch_reorder_all (SidebarBranch* self) {
 	_tmp0_ = self->priv->root;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_reorder_children (_tmp0_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 937 "Branch.c"
+#line 915 "Branch.c"
 }
 
 
-void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive) {
+void
+sidebar_branch_reorder_children (SidebarBranch* self,
+                                 SidebarEntry* entry,
+                                 gboolean recursive)
+{
 	SidebarBranchNode* entry_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_;
+	gpointer _tmp1_;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -950,45 +930,43 @@ void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry,
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = entry;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp2_;
+	entry_node = (SidebarBranchNode*) _tmp1_;
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (entry_node != NULL, "entry_node != null");
 #line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = recursive;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_reorder_children (entry_node, _tmp3_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+	sidebar_branch_node_reorder_children (entry_node, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 967 "Branch.c"
+#line 943 "Branch.c"
 }
 
 
-void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator) {
+void
+sidebar_branch_change_all_comparators (SidebarBranch* self,
+                                       GCompareFunc comparator)
+{
 	SidebarBranchNode* _tmp0_;
-	GCompareFunc _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->root;
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = comparator;
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_change_comparator (_tmp0_, _tmp1_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 982 "Branch.c"
+	sidebar_branch_node_change_comparator (_tmp0_, comparator, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+#line 958 "Branch.c"
 }
 
 
-void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator) {
+void
+sidebar_branch_change_comparator (SidebarBranch* self,
+                                  SidebarEntry* entry,
+                                  gboolean recursive,
+                                  GCompareFunc comparator)
+{
 	SidebarBranchNode* entry_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	GCompareFunc _tmp3_;
-	gboolean _tmp4_;
+	gpointer _tmp1_;
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -996,35 +974,31 @@ void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry,
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = entry;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp2_;
+	entry_node = (SidebarBranchNode*) _tmp1_;
 #line 341 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (entry_node != NULL, "entry_node != null");
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = comparator;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = recursive;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_change_comparator (entry_node, _tmp3_, _tmp4_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+	sidebar_branch_node_change_comparator (entry_node, comparator, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 1015 "Branch.c"
+#line 987 "Branch.c"
 }
 
 
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) {
+gint
+sidebar_branch_get_child_count (SidebarBranch* self,
+                                SidebarEntry* parent)
+{
 	gint result = 0;
 	SidebarBranchNode* parent_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	SidebarBranchNode* _tmp3_;
-	gint _tmp4_ = 0;
-	SidebarBranchNode* _tmp5_;
-	GeeSortedSet* _tmp6_;
+	gpointer _tmp1_;
+	SidebarBranchNode* _tmp2_;
+	gint _tmp3_ = 0;
+	SidebarBranchNode* _tmp4_;
+	GeeSortedSet* _tmp5_;
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), 0);
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1032,65 +1006,63 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent)
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp2_;
+	parent_node = (SidebarBranchNode*) _tmp1_;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = parent_node;
+	_tmp2_ = parent_node;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ != NULL, "parent_node != null");
+	_vala_assert (_tmp2_ != NULL, "parent_node != null");
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = parent_node;
+	_tmp4_ = parent_node;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = _tmp5_->children;
+	_tmp5_ = _tmp4_->children;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp6_ != NULL) {
-#line 1051 "Branch.c"
-		SidebarBranchNode* _tmp7_;
-		GeeSortedSet* _tmp8_;
+	if (_tmp5_ != NULL) {
+#line 1023 "Branch.c"
+		SidebarBranchNode* _tmp6_;
+		GeeSortedSet* _tmp7_;
+		gint _tmp8_;
 		gint _tmp9_;
-		gint _tmp10_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp7_ = parent_node;
+		_tmp6_ = parent_node;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp8_ = _tmp7_->children;
+		_tmp7_ = _tmp6_->children;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = _tmp10_;
-#line 1066 "Branch.c"
+		_tmp3_ = _tmp9_;
+#line 1038 "Branch.c"
 	} else {
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = 0;
-#line 1070 "Branch.c"
+		_tmp3_ = 0;
+#line 1042 "Branch.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (parent_node);
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1078 "Branch.c"
+#line 1050 "Branch.c"
 }
 
 
-GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) {
+GeeList*
+sidebar_branch_get_children (SidebarBranch* self,
+                             SidebarEntry* parent)
+{
 	GeeList* result = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	GeeSortedSet* _tmp7_;
+	GeeHashMap* _tmp1_;
+	gpointer _tmp2_;
+	SidebarBranchNode* _tmp3_;
+	GeeSortedSet* _tmp4_;
 	GeeList* child_entries = NULL;
-	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp5_;
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1098,93 +1070,84 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp2_, "map.has_key(parent)");
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)");
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = parent;
+	_tmp1_ = self->priv->map;
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp5_;
+	parent_node = (SidebarBranchNode*) _tmp2_;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = parent_node;
+	_tmp3_ = parent_node;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = _tmp6_->children;
+	_tmp4_ = _tmp3_->children;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp7_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_sidebar_branch_node_unref0 (parent_node);
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1127 "Branch.c"
+#line 1093 "Branch.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
-#line 1133 "Branch.c"
+	child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
+#line 1099 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp9_;
-		GeeSortedSet* _tmp10_;
-		GeeIterator* _tmp11_;
+		SidebarBranchNode* _tmp6_;
+		GeeSortedSet* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp9_ = parent_node;
+		_tmp6_ = parent_node;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp10_ = _tmp9_->children;
+		_tmp7_ = _tmp6_->children;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp11_;
+		_child_it = _tmp8_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1149 "Branch.c"
-			GeeIterator* _tmp12_;
-			gboolean _tmp13_;
+#line 1115 "Branch.c"
+			GeeIterator* _tmp9_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp14_;
-			gpointer _tmp15_;
-			GeeList* _tmp16_;
-			SidebarBranchNode* _tmp17_;
-			SidebarEntry* _tmp18_;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp12_ = _child_it;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			GeeList* _tmp12_;
+			SidebarBranchNode* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = gee_iterator_next (_tmp12_);
+			_tmp9_ = _child_it;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp13_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1166 "Branch.c"
+#line 1129 "Branch.c"
 			}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = _child_it;
+			_tmp10_ = _child_it;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = gee_iterator_get (_tmp14_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp15_;
+			child = (SidebarBranchNode*) _tmp11_;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = child_entries;
+			_tmp12_ = child_entries;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ = child;
+			_tmp13_ = child;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp18_ = _tmp17_->entry;
+			_tmp14_ = _tmp13_->entry;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1184 "Branch.c"
+#line 1147 "Branch.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1188 "Branch.c"
+#line 1151 "Branch.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = child_entries;
@@ -1192,19 +1155,23 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 	_sidebar_branch_node_unref0 (parent_node);
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1196 "Branch.c"
+#line 1159 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target) {
+SidebarEntry*
+sidebar_branch_find_first_child (SidebarBranch* self,
+                                 SidebarEntry* parent,
+                                 Locator locator,
+                                 void* locator_target)
+{
 	SidebarEntry* result = NULL;
 	SidebarBranchNode* parent_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
+	SidebarBranchNode* _tmp2_;
 	SidebarBranchNode* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	GeeSortedSet* _tmp5_;
+	GeeSortedSet* _tmp4_;
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1212,95 +1179,81 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp2_;
+	parent_node = (SidebarBranchNode*) _tmp1_;
 #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = parent_node;
+	_tmp2_ = parent_node;
 #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ != NULL, "parent_node != null");
+	_vala_assert (_tmp2_ != NULL, "parent_node != null");
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = parent_node;
+	_tmp3_ = parent_node;
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = _tmp4_->children;
+	_tmp4_ = _tmp3_->children;
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_sidebar_branch_node_unref0 (parent_node);
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1237 "Branch.c"
+#line 1202 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp6_;
-		GeeSortedSet* _tmp7_;
-		GeeIterator* _tmp8_;
+		SidebarBranchNode* _tmp5_;
+		GeeSortedSet* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp6_ = parent_node;
+		_tmp5_ = parent_node;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp7_ = _tmp6_->children;
+		_tmp6_ = _tmp5_->children;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp8_;
+		_child_it = _tmp7_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1254 "Branch.c"
-			GeeIterator* _tmp9_;
-			gboolean _tmp10_;
+#line 1219 "Branch.c"
+			GeeIterator* _tmp8_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp11_;
-			gpointer _tmp12_;
-			Locator _tmp13_;
-			void* _tmp13__target;
-			SidebarBranchNode* _tmp14_;
-			SidebarEntry* _tmp15_;
-			gboolean _tmp16_;
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = _child_it;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			SidebarBranchNode* _tmp11_;
+			SidebarEntry* _tmp12_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp10_ = gee_iterator_next (_tmp9_);
+			_tmp8_ = _child_it;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp10_) {
+			if (!gee_iterator_next (_tmp8_)) {
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1273 "Branch.c"
+#line 1232 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp11_ = _child_it;
+			_tmp9_ = _child_it;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp12_ = gee_iterator_get (_tmp11_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp12_;
+			child = (SidebarBranchNode*) _tmp10_;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = locator;
+			_tmp11_ = child;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13__target = locator_target;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = child;
+			_tmp12_ = _tmp11_->entry;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = _tmp14_->entry;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = _tmp13_ (_tmp15_, _tmp13__target);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp16_) {
-#line 1293 "Branch.c"
-				SidebarBranchNode* _tmp17_;
-				SidebarEntry* _tmp18_;
-				SidebarEntry* _tmp19_;
+			if (locator (_tmp12_, locator_target)) {
+#line 1246 "Branch.c"
+				SidebarBranchNode* _tmp13_;
+				SidebarEntry* _tmp14_;
+				SidebarEntry* _tmp15_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp17_ = child;
+				_tmp13_ = child;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp18_ = _tmp17_->entry;
+				_tmp14_ = _tmp13_->entry;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp19_ = _g_object_ref0 (_tmp18_);
+				_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				result = _tmp19_;
+				result = _tmp15_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1309,15 +1262,15 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 				_sidebar_branch_node_unref0 (parent_node);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 1313 "Branch.c"
+#line 1266 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1317 "Branch.c"
+#line 1270 "Branch.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1321 "Branch.c"
+#line 1274 "Branch.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = NULL;
@@ -1325,341 +1278,339 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 	_sidebar_branch_node_unref0 (parent_node);
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1329 "Branch.c"
+#line 1282 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_parent (SidebarBranch* self,
+                           SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarEntry* _tmp11_;
-	SidebarEntry* _tmp12_;
+	SidebarEntry* _tmp9_;
+	SidebarEntry* _tmp10_;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1365 "Branch.c"
+#line 1317 "Branch.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->entry;
+	_tmp9_ = _tmp8_->entry;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = _g_object_ref0 (_tmp11_);
+	_tmp10_ = _g_object_ref0 (_tmp9_);
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp12_;
+	result = _tmp10_;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1399 "Branch.c"
+#line 1349 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_previous_sibling (SidebarBranch* self,
+                                     SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	GeeSortedSet* _tmp11_;
+	GeeSortedSet* _tmp9_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	GeeSortedSet* _tmp12_;
 	SidebarBranchNode* _tmp13_;
-	GeeSortedSet* _tmp14_;
-	SidebarBranchNode* _tmp15_;
-	gpointer _tmp16_;
-	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_;
-	SidebarEntry* _tmp21_;
+	gpointer _tmp14_;
+	SidebarEntry* _tmp15_ = NULL;
+	SidebarBranchNode* _tmp16_;
+	SidebarEntry* _tmp19_;
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1443 "Branch.c"
+#line 1392 "Branch.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->children;
+	_tmp9_ = _tmp8_->children;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null");
+	_vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null");
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp10_ = entry_node;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp11_ = _tmp10_->parent;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = _tmp13_->children;
+	_tmp12_ = _tmp11_->children;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node;
+	_tmp13_ = entry_node;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = gee_sorted_set_lower (_tmp14_, _tmp15_);
+	_tmp14_ = gee_sorted_set_lower (_tmp12_, _tmp13_);
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sibling = (SidebarBranchNode*) _tmp16_;
+	sibling = (SidebarBranchNode*) _tmp14_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = sibling;
+	_tmp16_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp18_ != NULL) {
-#line 1487 "Branch.c"
-		SidebarBranchNode* _tmp19_;
-		SidebarEntry* _tmp20_;
+	if (_tmp16_ != NULL) {
+#line 1434 "Branch.c"
+		SidebarBranchNode* _tmp17_;
+		SidebarEntry* _tmp18_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp19_ = sibling;
+		_tmp17_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = _tmp19_->entry;
+		_tmp18_ = _tmp17_->entry;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _tmp20_;
-#line 1496 "Branch.c"
+		_tmp15_ = _tmp18_;
+#line 1443 "Branch.c"
 	} else {
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = NULL;
-#line 1500 "Branch.c"
+		_tmp15_ = NULL;
+#line 1447 "Branch.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = _g_object_ref0 (_tmp17_);
+	_tmp19_ = _g_object_ref0 (_tmp15_);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp21_;
+	result = _tmp19_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (sibling);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1512 "Branch.c"
+#line 1459 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_next_sibling (SidebarBranch* self,
+                                 SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	GeeSortedSet* _tmp11_;
+	GeeSortedSet* _tmp9_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	GeeSortedSet* _tmp12_;
 	SidebarBranchNode* _tmp13_;
-	GeeSortedSet* _tmp14_;
-	SidebarBranchNode* _tmp15_;
-	gpointer _tmp16_;
-	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_;
-	SidebarEntry* _tmp21_;
+	gpointer _tmp14_;
+	SidebarEntry* _tmp15_ = NULL;
+	SidebarBranchNode* _tmp16_;
+	SidebarEntry* _tmp19_;
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1556 "Branch.c"
+#line 1502 "Branch.c"
 	}
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->children;
+	_tmp9_ = _tmp8_->children;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null");
+	_vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null");
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp10_ = entry_node;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp11_ = _tmp10_->parent;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = _tmp13_->children;
+	_tmp12_ = _tmp11_->children;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node;
+	_tmp13_ = entry_node;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = gee_sorted_set_higher (_tmp14_, _tmp15_);
+	_tmp14_ = gee_sorted_set_higher (_tmp12_, _tmp13_);
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sibling = (SidebarBranchNode*) _tmp16_;
+	sibling = (SidebarBranchNode*) _tmp14_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = sibling;
+	_tmp16_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp18_ != NULL) {
-#line 1600 "Branch.c"
-		SidebarBranchNode* _tmp19_;
-		SidebarEntry* _tmp20_;
+	if (_tmp16_ != NULL) {
+#line 1544 "Branch.c"
+		SidebarBranchNode* _tmp17_;
+		SidebarEntry* _tmp18_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp19_ = sibling;
+		_tmp17_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = _tmp19_->entry;
+		_tmp18_ = _tmp17_->entry;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _tmp20_;
-#line 1609 "Branch.c"
+		_tmp15_ = _tmp18_;
+#line 1553 "Branch.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = NULL;
-#line 1613 "Branch.c"
+		_tmp15_ = NULL;
+#line 1557 "Branch.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = _g_object_ref0 (_tmp17_);
+	_tmp19_ = _g_object_ref0 (_tmp15_);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp21_;
+	result = _tmp19_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (sibling);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1625 "Branch.c"
+#line 1569 "Branch.c"
 }
 
 
-static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_;
-	SidebarEntry* _tmp1_;
+static void
+sidebar_branch_prune_callback (SidebarBranch* self,
+                               SidebarBranchNode* node)
+{
+	SidebarEntry* _tmp0_;
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node));
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = node;
-#line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _tmp0_->entry;
+	_tmp0_ = node->entry;
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp1_);
-#line 1642 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp0_);
+#line 1586 "Branch.c"
 }
 
 
-static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_;
-	SidebarEntry* _tmp1_;
+static void
+sidebar_branch_children_reordered_callback (SidebarBranch* self,
+                                            SidebarBranchNode* node)
+{
+	SidebarEntry* _tmp0_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node));
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = node;
+	_tmp0_ = node->entry;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _tmp0_->entry;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp1_);
-#line 1659 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp0_);
+#line 1603 "Branch.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT callback;
 	register GCClosure * cc;
@@ -1674,28 +1625,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1678 "Branch.c"
+#line 1629 "Branch.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = closure->data;
-#line 1684 "Branch.c"
+#line 1635 "Branch.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1690 "Branch.c"
+#line 1641 "Branch.c"
 }
 
 
-static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
+static SidebarBranchNode*
+sidebar_branch_node_construct (GType object_type,
+                               SidebarEntry* entry,
+                               SidebarBranchNode* parent,
+                               GCompareFunc comparator)
+{
 	SidebarBranchNode* self = NULL;
 	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
-	SidebarBranchNode* _tmp2_;
-	GCompareFunc _tmp3_;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1703,101 +1656,80 @@ static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, Side
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = (SidebarBranchNode*) g_type_create_instance (object_type);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (entry);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->entry);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->entry = _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = parent;
+	self->entry = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->parent = _tmp2_;
+	self->parent = parent;
 #line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = comparator;
-#line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->comparator = _tmp3_;
+	self->comparator = comparator;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 1724 "Branch.c"
+#line 1671 "Branch.c"
 }
 
 
-static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
+static SidebarBranchNode*
+sidebar_branch_node_new (SidebarEntry* entry,
+                         SidebarBranchNode* parent,
+                         GCompareFunc comparator)
+{
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_node_construct (SIDEBAR_BRANCH_TYPE_NODE, entry, parent, comparator);
-#line 1731 "Branch.c"
+#line 1682 "Branch.c"
 }
 
 
-static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode) {
+static gint
+sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode,
+                                        SidebarBranchNode* bnode)
+{
 	gint result = 0;
 	SidebarBranchNode* _tmp0_;
 	SidebarBranchNode* _tmp1_;
 	SidebarBranchNode* _tmp2_;
-	SidebarBranchNode* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	SidebarBranchNode* _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	SidebarBranchNode* _tmp7_;
-	GCompareFunc _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarEntry* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	SidebarEntry* _tmp12_;
-	gint _tmp13_;
+	GCompareFunc _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (anode), 0);
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (bnode), 0);
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = anode;
-#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = bnode;
-#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (anode == bnode) {
 #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = 0;
 #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1765 "Branch.c"
+#line 1707 "Branch.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = anode;
+	_tmp0_ = anode->parent;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = _tmp2_->parent;
+	_tmp1_ = bnode->parent;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = bnode;
-#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = _tmp4_->parent;
-#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ == _tmp5_, "anode.parent == bnode.parent");
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = anode;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = _tmp6_->parent;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->comparator;
+	_vala_assert (_tmp0_ == _tmp1_, "anode.parent == bnode.parent");
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = anode;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->entry;
+	_tmp2_ = anode->parent;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = bnode;
+	_tmp3_ = _tmp2_->comparator;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = _tmp11_->entry;
+	_tmp4_ = anode->entry;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp8_ (_tmp10_, _tmp12_);
+	_tmp5_ = bnode->entry;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp13_;
+	result = _tmp3_ (_tmp4_, _tmp5_);
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1797 "Branch.c"
+#line 1727 "Branch.c"
 }
 
 
-static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
+static gboolean
+sidebar_branch_node_has_children (SidebarBranchNode* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GeeSortedSet* _tmp1_;
@@ -1807,7 +1739,7 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 	_tmp1_ = self->children;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp1_ != NULL) {
-#line 1811 "Branch.c"
+#line 1743 "Branch.c"
 		GeeSortedSet* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
@@ -1819,82 +1751,82 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 		_tmp4_ = _tmp3_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 1823 "Branch.c"
+#line 1755 "Branch.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = FALSE;
-#line 1827 "Branch.c"
+#line 1759 "Branch.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1833 "Branch.c"
+#line 1765 "Branch.c"
 }
 
 
-static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a,
+                                                            gconstpointer b,
+                                                            gpointer self)
+{
 	gint result;
 	result = sidebar_branch_node_comparator_wrapper ((SidebarBranchNode*) a, (SidebarBranchNode*) b);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1842 "Branch.c"
+#line 1778 "Branch.c"
 }
 
 
-static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child) {
-	SidebarBranchNode* _tmp0_;
-	GeeSortedSet* _tmp1_;
+static void
+sidebar_branch_node_add_child (SidebarBranchNode* self,
+                               SidebarBranchNode* child)
+{
+	GeeSortedSet* _tmp0_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	gboolean _tmp5_;
+	GeeSortedSet* _tmp2_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (child));
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = child;
-#line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_->parent = self;
+	child->parent = self;
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->children;
+	_tmp0_ = self->children;
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp1_ == NULL) {
-#line 1865 "Branch.c"
-		GeeTreeSet* _tmp2_;
+	if (_tmp0_ == NULL) {
+#line 1799 "Branch.c"
+		GeeTreeSet* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+		_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1873 "Branch.c"
+		self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
+#line 1807 "Branch.c"
 	}
 #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->children;
-#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = child;
-#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_);
+	_tmp2_ = self->children;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	added = _tmp5_;
+	added = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), child);
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (added, "added");
-#line 1885 "Branch.c"
+#line 1815 "Branch.c"
 }
 
 
-static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child) {
+static void
+sidebar_branch_node_remove_child (SidebarBranchNode* self,
+                                  SidebarBranchNode* child)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* new_children = NULL;
 	GeeTreeSet* _tmp1_;
 	gboolean found = FALSE;
-	gboolean _tmp12_;
-	GeeSortedSet* _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	SidebarBranchNode* _tmp18_;
+	gboolean _tmp10_;
+	GeeSortedSet* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1909,7 +1841,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	found = FALSE;
-#line 1913 "Branch.c"
+#line 1845 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
 		GeeSortedSet* _tmp2_;
@@ -1922,105 +1854,101 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 		_c_it = _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1926 "Branch.c"
+#line 1858 "Branch.c"
 			GeeIterator* _tmp4_;
-			gboolean _tmp5_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp6_;
-			gpointer _tmp7_;
-			SidebarBranchNode* _tmp8_;
-			SidebarBranchNode* _tmp9_;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			SidebarBranchNode* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp4_ = _c_it;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp5_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1942 "Branch.c"
+#line 1870 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = _c_it;
+			_tmp5_ = _c_it;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = gee_iterator_get (_tmp6_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			c = (SidebarBranchNode*) _tmp7_;
-#line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = c;
+			c = (SidebarBranchNode*) _tmp6_;
 #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = child;
+			_tmp7_ = c;
 #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp8_ != _tmp9_) {
-#line 1956 "Branch.c"
-				GeeSortedSet* _tmp10_;
-				SidebarBranchNode* _tmp11_;
+			if (_tmp7_ != child) {
+#line 1882 "Branch.c"
+				GeeSortedSet* _tmp8_;
+				SidebarBranchNode* _tmp9_;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = new_children;
+				_tmp8_ = new_children;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = c;
+				_tmp9_ = c;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 1965 "Branch.c"
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_);
+#line 1891 "Branch.c"
 			} else {
 #line 86 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				found = TRUE;
-#line 1969 "Branch.c"
+#line 1895 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 1973 "Branch.c"
+#line 1899 "Branch.c"
 		}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 1977 "Branch.c"
+#line 1903 "Branch.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = found;
+	_tmp10_ = found;
 #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp12_, "found");
+	_vala_assert (_tmp10_, "found");
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = new_children;
+	_tmp11_ = new_children;
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = _tmp14_;
+	_tmp13_ = _tmp12_;
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp15_ != 0) {
-#line 1991 "Branch.c"
-		GeeSortedSet* _tmp16_;
-		GeeSortedSet* _tmp17_;
+	if (_tmp13_ != 0) {
+#line 1917 "Branch.c"
+		GeeSortedSet* _tmp14_;
+		GeeSortedSet* _tmp15_;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp16_ = new_children;
+		_tmp14_ = new_children;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _g_object_ref0 (_tmp16_);
+		_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		self->children = _tmp17_;
-#line 2002 "Branch.c"
+		self->children = _tmp15_;
+#line 1928 "Branch.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		self->children = NULL;
-#line 2008 "Branch.c"
+#line 1934 "Branch.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = child;
-#line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_->parent = NULL;
+	child->parent = NULL;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (new_children);
-#line 2016 "Branch.c"
+#line 1940 "Branch.c"
 }
 
 
-static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target) {
+static void
+sidebar_branch_node_prune_children (SidebarBranchNode* self,
+                                    SidebarBranchNodePruneCallback cb,
+                                    void* cb_target)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* old_children = NULL;
-	GeeSortedSet* _tmp9_;
-	GeeSortedSet* _tmp10_;
+	GeeSortedSet* _tmp7_;
+	GeeSortedSet* _tmp8_;
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 100 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2029,7 +1957,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 	if (_tmp0_ == NULL) {
 #line 101 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2033 "Branch.c"
+#line 1961 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
@@ -2043,118 +1971,103 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 		_child_it = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2047 "Branch.c"
+#line 1975 "Branch.c"
 			GeeIterator* _tmp3_;
-			gboolean _tmp4_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp5_;
-			gpointer _tmp6_;
-			SidebarBranchNode* _tmp7_;
-			SidebarBranchNodePruneCallback _tmp8_;
-			void* _tmp8__target;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SidebarBranchNode* _tmp6_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _child_it;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp4_) {
+			if (!gee_iterator_next (_tmp3_)) {
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2064 "Branch.c"
+#line 1987 "Branch.c"
 			}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = _child_it;
+			_tmp4_ = _child_it;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = gee_iterator_get (_tmp5_);
+			_tmp5_ = gee_iterator_get (_tmp4_);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp6_;
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = child;
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = cb;
+			child = (SidebarBranchNode*) _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8__target = cb_target;
+			_tmp6_ = child;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			sidebar_branch_node_prune_children (_tmp7_, _tmp8_, _tmp8__target);
+			sidebar_branch_node_prune_children (_tmp6_, cb, cb_target);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2082 "Branch.c"
+#line 2001 "Branch.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2086 "Branch.c"
+#line 2005 "Branch.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = self->children;
+	_tmp7_ = self->children;
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _g_object_ref0 (_tmp9_);
+	_tmp8_ = _g_object_ref0 (_tmp7_);
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_children = _tmp10_;
+	old_children = _tmp8_;
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = NULL;
-#line 2098 "Branch.c"
+#line 2017 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		GeeSortedSet* _tmp11_;
-		GeeIterator* _tmp12_;
+		GeeSortedSet* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = old_children;
+		_tmp9_ = old_children;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp12_;
+		_child_it = _tmp10_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2111 "Branch.c"
-			GeeIterator* _tmp13_;
-			gboolean _tmp14_;
+#line 2030 "Branch.c"
+			GeeIterator* _tmp11_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp15_;
-			gpointer _tmp16_;
-			SidebarBranchNodePruneCallback _tmp17_;
-			void* _tmp17__target;
-			SidebarBranchNode* _tmp18_;
-#line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = _child_it;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			SidebarBranchNode* _tmp14_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = gee_iterator_next (_tmp13_);
+			_tmp11_ = _child_it;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp14_) {
+			if (!gee_iterator_next (_tmp11_)) {
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2128 "Branch.c"
+#line 2042 "Branch.c"
 			}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = _child_it;
+			_tmp12_ = _child_it;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = gee_iterator_get (_tmp15_);
+			_tmp13_ = gee_iterator_get (_tmp12_);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp16_;
-#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ = cb;
+			child = (SidebarBranchNode*) _tmp13_;
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17__target = cb_target;
-#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp18_ = child;
+			_tmp14_ = child;
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ (_tmp18_, _tmp17__target);
+			cb (_tmp14_, cb_target);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2146 "Branch.c"
+#line 2056 "Branch.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2150 "Branch.c"
+#line 2060 "Branch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_children);
-#line 2154 "Branch.c"
+#line 2064 "Branch.c"
 }
 
 
-static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child) {
+static gint
+sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
+                                           SidebarBranchNode* child)
+{
 	gint result = 0;
 	GeeSortedSet* _tmp0_;
 	gint index = 0;
@@ -2170,11 +2083,11 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		result = -1;
 #line 120 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 2174 "Branch.c"
+#line 2087 "Branch.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	index = 0;
-#line 2178 "Branch.c"
+#line 2091 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
 		GeeSortedSet* _tmp1_;
@@ -2187,37 +2100,31 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		_c_it = _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2191 "Branch.c"
+#line 2104 "Branch.c"
 			GeeIterator* _tmp3_;
-			gboolean _tmp4_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp5_;
-			gpointer _tmp6_;
-			SidebarBranchNode* _tmp7_;
-			SidebarBranchNode* _tmp8_;
-			gint _tmp9_;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SidebarBranchNode* _tmp6_;
+			gint _tmp7_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _c_it;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp4_) {
+			if (!gee_iterator_next (_tmp3_)) {
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2208 "Branch.c"
+#line 2117 "Branch.c"
 			}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = _c_it;
+			_tmp4_ = _c_it;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = gee_iterator_get (_tmp5_);
+			_tmp5_ = gee_iterator_get (_tmp4_);
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			c = (SidebarBranchNode*) _tmp6_;
+			c = (SidebarBranchNode*) _tmp5_;
 #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = child;
+			_tmp6_ = c;
 #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = c;
-#line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp7_ == _tmp8_) {
+			if (child == _tmp6_) {
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				result = index;
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2226,43 +2133,41 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 				_g_object_unref0 (_c_it);
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 2230 "Branch.c"
+#line 2137 "Branch.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = index;
+			_tmp7_ = index;
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			index = _tmp9_ + 1;
+			index = _tmp7_ + 1;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 2238 "Branch.c"
+#line 2145 "Branch.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 2242 "Branch.c"
+#line 2149 "Branch.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = -1;
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2248 "Branch.c"
+#line 2155 "Branch.c"
 }
 
 
-static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child) {
+static gboolean
+sidebar_branch_node_reorder_child (SidebarBranchNode* self,
+                                   SidebarBranchNode* child)
+{
 	gboolean result = FALSE;
 	GeeSortedSet* _tmp0_;
 	gint old_index = 0;
-	SidebarBranchNode* _tmp1_;
-	gint _tmp2_;
 	GeeSortedSet* new_children = NULL;
-	GeeTreeSet* _tmp3_;
+	GeeTreeSet* _tmp1_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp4_;
-	gboolean _tmp5_;
-	GeeSortedSet* _tmp6_;
+	GeeSortedSet* _tmp2_;
+	GeeSortedSet* _tmp3_;
 	gint new_index = 0;
-	SidebarBranchNode* _tmp7_;
-	gint _tmp8_;
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2272,37 +2177,27 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 #line 135 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (_tmp0_ != NULL, "children != null");
 #line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = child;
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = sidebar_branch_node_index_of_by_reference (self, _tmp1_);
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_index = _tmp2_;
+	old_index = sidebar_branch_node_index_of_by_reference (self, child);
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (old_index >= 0, "old_index >= 0");
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = self->children;
+	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = self->children;
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	added = _tmp5_;
+	added = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 148 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (added, "added");
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = _g_object_ref0 (new_children);
+	_tmp3_ = _g_object_ref0 (new_children);
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->children = _tmp6_;
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = child;
+	self->children = _tmp3_;
 #line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = sidebar_branch_node_index_of_by_reference (self, _tmp7_);
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_index = _tmp8_;
+	new_index = sidebar_branch_node_index_of_by_reference (self, child);
 #line 153 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (new_index >= 0, "new_index >= 0");
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2311,11 +2206,16 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 	_g_object_unref0 (new_children);
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2315 "Branch.c"
+#line 2210 "Branch.c"
 }
 
 
-static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
+static void
+sidebar_branch_node_reorder_children (SidebarBranchNode* self,
+                                      gboolean recursive,
+                                      SidebarBranchNodeChildrenReorderedCallback cb,
+                                      void* cb_target)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* reordered = NULL;
 	GeeTreeSet* _tmp1_;
@@ -2323,9 +2223,6 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	GeeSortedSet* _tmp3_;
 	GeeSortedSet* _tmp4_;
 	GeeSortedSet* _tmp5_;
-	gboolean _tmp6_;
-	SidebarBranchNodeChildrenReorderedCallback _tmp15_;
-	void* _tmp15__target;
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2334,7 +2231,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	if (_tmp0_ == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2338 "Branch.c"
+#line 2235 "Branch.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
@@ -2355,256 +2252,248 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 #line 164 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = _tmp5_;
 #line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = recursive;
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp6_) {
-#line 2362 "Branch.c"
+	if (recursive) {
+#line 2257 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp7_;
-			GeeIterator* _tmp8_;
+			GeeSortedSet* _tmp6_;
+			GeeIterator* _tmp7_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = self->children;
+			_tmp6_ = self->children;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_child_it = _tmp8_;
+			_child_it = _tmp7_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2375 "Branch.c"
-				GeeIterator* _tmp9_;
-				gboolean _tmp10_;
+#line 2270 "Branch.c"
+				GeeIterator* _tmp8_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp11_;
-				gpointer _tmp12_;
-				SidebarBranchNode* _tmp13_;
-				SidebarBranchNodeChildrenReorderedCallback _tmp14_;
-				void* _tmp14__target;
-#line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp9_ = _child_it;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				SidebarBranchNode* _tmp11_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = gee_iterator_next (_tmp9_);
+				_tmp8_ = _child_it;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				if (!_tmp10_) {
+				if (!gee_iterator_next (_tmp8_)) {
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2392 "Branch.c"
+#line 2282 "Branch.c"
 				}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = _child_it;
+				_tmp9_ = _child_it;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp12_ = gee_iterator_get (_tmp11_);
+				_tmp10_ = gee_iterator_get (_tmp9_);
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				child = (SidebarBranchNode*) _tmp12_;
+				child = (SidebarBranchNode*) _tmp10_;
 #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp13_ = child;
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp14_ = cb;
+				_tmp11_ = child;
 #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp14__target = cb_target;
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				sidebar_branch_node_reorder_children (_tmp13_, TRUE, _tmp14_, _tmp14__target);
+				sidebar_branch_node_reorder_children (_tmp11_, TRUE, cb, cb_target);
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2410 "Branch.c"
+#line 2296 "Branch.c"
 			}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2414 "Branch.c"
+#line 2300 "Branch.c"
 		}
 	}
 #line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = cb;
-#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15__target = cb_target;
-#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ (self, _tmp15__target);
+	cb (self, cb_target);
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (reordered);
-#line 2425 "Branch.c"
+#line 2307 "Branch.c"
 }
 
 
-static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
-	GCompareFunc _tmp0_;
-	SidebarBranchNodeChildrenReorderedCallback _tmp1_;
-	void* _tmp1__target;
-	gboolean _tmp2_;
+static void
+sidebar_branch_node_change_comparator (SidebarBranchNode* self,
+                                       GCompareFunc comparator,
+                                       gboolean recursive,
+                                       SidebarBranchNodeChildrenReorderedCallback cb,
+                                       void* cb_target)
+{
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = comparator;
-#line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->comparator = _tmp0_;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = cb;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1__target = cb_target;
+	self->comparator = comparator;
 #line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_reorder_children (self, FALSE, _tmp1_, _tmp1__target);
+	sidebar_branch_node_reorder_children (self, FALSE, cb, cb_target);
 #line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = recursive;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_) {
-#line 2450 "Branch.c"
+	if (recursive) {
+#line 2326 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp3_;
-			GeeIterator* _tmp4_;
+			GeeSortedSet* _tmp0_;
+			GeeIterator* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp3_ = self->children;
+			_tmp0_ = self->children;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_child_it = _tmp4_;
+			_child_it = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2463 "Branch.c"
-				GeeIterator* _tmp5_;
-				gboolean _tmp6_;
+#line 2339 "Branch.c"
+				GeeIterator* _tmp2_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp7_;
-				gpointer _tmp8_;
-				SidebarBranchNode* _tmp9_;
-				GCompareFunc _tmp10_;
-				SidebarBranchNodeChildrenReorderedCallback _tmp11_;
-				void* _tmp11__target;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp5_ = _child_it;
+				GeeIterator* _tmp3_;
+				gpointer _tmp4_;
+				SidebarBranchNode* _tmp5_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp6_ = gee_iterator_next (_tmp5_);
+				_tmp2_ = _child_it;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				if (!_tmp6_) {
+				if (!gee_iterator_next (_tmp2_)) {
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2481 "Branch.c"
+#line 2351 "Branch.c"
 				}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp7_ = _child_it;
+				_tmp3_ = _child_it;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp8_ = gee_iterator_get (_tmp7_);
+				_tmp4_ = gee_iterator_get (_tmp3_);
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				child = (SidebarBranchNode*) _tmp8_;
+				child = (SidebarBranchNode*) _tmp4_;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp9_ = child;
+				_tmp5_ = child;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = comparator;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = cb;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11__target = cb_target;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				sidebar_branch_node_change_comparator (_tmp9_, _tmp10_, TRUE, _tmp11_, _tmp11__target);
+				sidebar_branch_node_change_comparator (_tmp5_, comparator, TRUE, cb, cb_target);
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2501 "Branch.c"
+#line 2365 "Branch.c"
 			}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2505 "Branch.c"
+#line 2369 "Branch.c"
 		}
 	}
 }
 
 
-static void sidebar_branch_value_node_init (GValue* value) {
+static void
+sidebar_branch_value_node_init (GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	value->data[0].v_pointer = NULL;
-#line 2514 "Branch.c"
+#line 2380 "Branch.c"
 }
 
 
-static void sidebar_branch_value_node_free_value (GValue* value) {
+static void
+sidebar_branch_value_node_free_value (GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (value->data[0].v_pointer);
-#line 2523 "Branch.c"
+#line 2391 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+sidebar_branch_value_node_copy_value (const GValue* src_value,
+                                      GValue* dest_value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (src_value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = sidebar_branch_node_ref (src_value->data[0].v_pointer);
-#line 2533 "Branch.c"
+#line 2404 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2537 "Branch.c"
+#line 2408 "Branch.c"
 	}
 }
 
 
-static gpointer sidebar_branch_value_node_peek_pointer (const GValue* value) {
+static gpointer
+sidebar_branch_value_node_peek_pointer (const GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2545 "Branch.c"
+#line 2418 "Branch.c"
 }
 
 
-static gchar* sidebar_branch_value_node_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+sidebar_branch_value_node_collect_value (GValue* value,
+                                         guint n_collect_values,
+                                         GTypeCValue* collect_values,
+                                         guint collect_flags)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (collect_values[0].v_pointer) {
-#line 2552 "Branch.c"
+#line 2430 "Branch.c"
 		SidebarBranchNode * object;
 		object = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2559 "Branch.c"
+#line 2437 "Branch.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2563 "Branch.c"
+#line 2441 "Branch.c"
 		}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = sidebar_branch_node_ref (object);
-#line 2567 "Branch.c"
+#line 2445 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2571 "Branch.c"
+#line 2449 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2575 "Branch.c"
+#line 2453 "Branch.c"
 }
 
 
-static gchar* sidebar_branch_value_node_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+sidebar_branch_value_node_lcopy_value (const GValue* value,
+                                       guint n_collect_values,
+                                       GTypeCValue* collect_values,
+                                       guint collect_flags)
+{
 	SidebarBranchNode ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!object_p) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2586 "Branch.c"
+#line 2469 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = NULL;
-#line 2592 "Branch.c"
+#line 2475 "Branch.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2596 "Branch.c"
+#line 2479 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2600 "Branch.c"
+#line 2483 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2604 "Branch.c"
+#line 2487 "Branch.c"
 }
 
 
-static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+sidebar_branch_param_spec_node (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags)
+{
 	SidebarBranchParamSpecNode* spec;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SIDEBAR_BRANCH_TYPE_NODE), NULL);
@@ -2614,20 +2503,25 @@ static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return G_PARAM_SPEC (spec);
-#line 2618 "Branch.c"
+#line 2507 "Branch.c"
 }
 
 
-static gpointer sidebar_branch_value_get_node (const GValue* value) {
+static gpointer
+sidebar_branch_value_get_node (const GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE), NULL);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2627 "Branch.c"
+#line 2518 "Branch.c"
 }
 
 
-static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
+static void
+sidebar_branch_value_set_node (GValue* value,
+                               gpointer v_object)
+{
 	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
@@ -2643,22 +2537,25 @@ static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2647 "Branch.c"
+#line 2541 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2651 "Branch.c"
+#line 2545 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2657 "Branch.c"
+#line 2551 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
+static void
+sidebar_branch_value_take_node (GValue* value,
+                                gpointer v_object)
+{
 	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
@@ -2672,40 +2569,46 @@ static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = v_object;
-#line 2676 "Branch.c"
+#line 2573 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2680 "Branch.c"
+#line 2577 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2686 "Branch.c"
+#line 2583 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) {
+static void
+sidebar_branch_node_class_init (SidebarBranchNodeClass * klass)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_parent_class = g_type_class_peek_parent (klass);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	((SidebarBranchNodeClass *) klass)->finalize = sidebar_branch_node_finalize;
-#line 2696 "Branch.c"
+#line 2595 "Branch.c"
 }
 
 
-static void sidebar_branch_node_instance_init (SidebarBranchNode * self) {
+static void
+sidebar_branch_node_instance_init (SidebarBranchNode * self)
+{
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = NULL;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->ref_count = 1;
-#line 2705 "Branch.c"
+#line 2606 "Branch.c"
 }
 
 
-static void sidebar_branch_node_finalize (SidebarBranchNode * obj) {
+static void
+sidebar_branch_node_finalize (SidebarBranchNode * obj)
+{
 	SidebarBranchNode * self;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_BRANCH_TYPE_NODE, SidebarBranchNode);
@@ -2715,11 +2618,13 @@ static void sidebar_branch_node_finalize (SidebarBranchNode * obj) {
 	_g_object_unref0 (self->entry);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
-#line 2719 "Branch.c"
+#line 2622 "Branch.c"
 }
 
 
-static GType sidebar_branch_node_get_type (void) {
+static GType
+sidebar_branch_node_get_type (void)
+{
 	static volatile gsize sidebar_branch_node_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_node_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { sidebar_branch_value_node_init, sidebar_branch_value_node_free_value, sidebar_branch_value_node_copy_value, sidebar_branch_value_node_peek_pointer, "p", sidebar_branch_value_node_collect_value, "p", sidebar_branch_value_node_lcopy_value };
@@ -2733,18 +2638,22 @@ static GType sidebar_branch_node_get_type (void) {
 }
 
 
-static gpointer sidebar_branch_node_ref (gpointer instance) {
+static gpointer
+sidebar_branch_node_ref (gpointer instance)
+{
 	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return instance;
-#line 2744 "Branch.c"
+#line 2651 "Branch.c"
 }
 
 
-static void sidebar_branch_node_unref (gpointer instance) {
+static void
+sidebar_branch_node_unref (gpointer instance)
+{
 	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2753,12 +2662,14 @@ static void sidebar_branch_node_unref (gpointer instance) {
 		SIDEBAR_BRANCH_NODE_GET_CLASS (self)->finalize (self);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2757 "Branch.c"
+#line 2666 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_class_init (SidebarBranchClass * klass) {
+static void
+sidebar_branch_class_init (SidebarBranchClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2777,11 +2688,13 @@ static void sidebar_branch_class_init (SidebarBranchClass * klass) {
 	sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL] = g_signal_new ("children-reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL] = g_signal_new ("show-branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 2781 "Branch.c"
+#line 2692 "Branch.c"
 }
 
 
-static void sidebar_branch_instance_init (SidebarBranch * self) {
+static void
+sidebar_branch_instance_init (SidebarBranch * self)
+{
 	GeeHashMap* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv = SIDEBAR_BRANCH_GET_PRIVATE (self);
@@ -2791,11 +2704,13 @@ static void sidebar_branch_instance_init (SidebarBranch * self) {
 	_tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv->map = _tmp0_;
-#line 2795 "Branch.c"
+#line 2708 "Branch.c"
 }
 
 
-static void sidebar_branch_finalize (GObject * obj) {
+static void
+sidebar_branch_finalize (GObject * obj)
+{
 	SidebarBranch * self;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_BRANCH, SidebarBranch);
@@ -2805,11 +2720,13 @@ static void sidebar_branch_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	G_OBJECT_CLASS (sidebar_branch_parent_class)->finalize (obj);
-#line 2809 "Branch.c"
+#line 2724 "Branch.c"
 }
 
 
-GType sidebar_branch_get_type (void) {
+GType
+sidebar_branch_get_type (void)
+{
 	static volatile gsize sidebar_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarBranch), 0, (GInstanceInitFunc) sidebar_branch_instance_init, NULL };
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 254fe54..ab4bbdb 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.36.6, the Vala compiler
+/* Entry.c generated by valac 0.40.4, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -35,9 +36,9 @@ typedef struct _SidebarTreeClass SidebarTreeClass;
 enum  {
 	SIDEBAR_ENTRY_SIDEBAR_TOOLTIP_CHANGED_SIGNAL,
 	SIDEBAR_ENTRY_SIDEBAR_ICON_CHANGED_SIGNAL,
-	SIDEBAR_ENTRY_LAST_SIGNAL
+	SIDEBAR_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_entry_signals[SIDEBAR_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_entry_signals[SIDEBAR_ENTRY_NUM_SIGNALS] = {0};
 
 #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
 #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
@@ -75,9 +76,9 @@ typedef struct _PageClass PageClass;
 enum  {
 	SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL,
 	SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL,
-	SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL
+	SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS
 };
-static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_LAST_SIGNAL] = {0};
+static guint sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_NUM_SIGNALS] = {0};
 
 #define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
 #define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
@@ -88,9 +89,9 @@ typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
 typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
 enum  {
 	SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL,
-	SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL
+	SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_NUM_SIGNALS] = {0};
 
 #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
 #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
@@ -101,9 +102,9 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
 typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
 enum  {
 	SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL,
-	SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL
+	SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS
 };
-static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_LAST_SIGNAL] = {0};
+static guint sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_NUM_SIGNALS] = {0};
 
 #define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
 #define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
@@ -229,10 +230,14 @@ gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self);
 gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self);
 gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self);
 gchar* sidebar_entry_to_string (SidebarEntry* self);
-void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree);
-static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree);
-void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree);
-static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree);
+void sidebar_entry_grafted (SidebarEntry* self,
+                            SidebarTree* tree);
+static void sidebar_entry_real_grafted (SidebarEntry* self,
+                                 SidebarTree* tree);
+void sidebar_entry_pruned (SidebarEntry* self,
+                           SidebarTree* tree);
+static void sidebar_entry_real_pruned (SidebarEntry* self,
+                                SidebarTree* tree);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
@@ -241,7 +246,8 @@ GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
 gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
-void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name);
+void sidebar_renameable_entry_rename (SidebarRenameableEntry* self,
+                                      const gchar* new_name);
 gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self);
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self);
@@ -252,81 +258,106 @@ GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
-gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources);
-gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self,
+                                                                    GeeList* sources);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self,
+                                                                              GtkSelectionData* data);
 GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST;
-void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data);
+void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self,
+                                                                GtkSelectionData* data);
 
 
-gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_name (SidebarEntry* self)
+{
 #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_name (self);
-#line 267 "Entry.c"
+#line 278 "Entry.c"
 }
 
 
-gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_tooltip (SidebarEntry* self)
+{
 #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 14 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_tooltip (self);
-#line 276 "Entry.c"
+#line 289 "Entry.c"
 }
 
 
-gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self) {
+gchar*
+sidebar_entry_get_sidebar_icon (SidebarEntry* self)
+{
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->get_sidebar_icon (self);
-#line 285 "Entry.c"
+#line 300 "Entry.c"
 }
 
 
-gchar* sidebar_entry_to_string (SidebarEntry* self) {
+gchar*
+sidebar_entry_to_string (SidebarEntry* self)
+{
 #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (self), NULL);
 #line 18 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_ENTRY_GET_INTERFACE (self)->to_string (self);
-#line 294 "Entry.c"
+#line 311 "Entry.c"
 }
 
 
-static void sidebar_entry_real_grafted (SidebarEntry* self, SidebarTree* tree) {
+static void
+sidebar_entry_real_grafted (SidebarEntry* self,
+                            SidebarTree* tree)
+{
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 301 "Entry.c"
+#line 321 "Entry.c"
 }
 
 
-void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree) {
+void
+sidebar_entry_grafted (SidebarEntry* self,
+                       SidebarTree* tree)
+{
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->grafted (self, tree);
-#line 310 "Entry.c"
+#line 333 "Entry.c"
 }
 
 
-static void sidebar_entry_real_pruned (SidebarEntry* self, SidebarTree* tree) {
+static void
+sidebar_entry_real_pruned (SidebarEntry* self,
+                           SidebarTree* tree)
+{
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (tree));
-#line 317 "Entry.c"
+#line 343 "Entry.c"
 }
 
 
-void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree) {
+void
+sidebar_entry_pruned (SidebarEntry* self,
+                      SidebarTree* tree)
+{
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (self));
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_ENTRY_GET_INTERFACE (self)->pruned (self, tree);
-#line 326 "Entry.c"
+#line 355 "Entry.c"
 }
 
 
-static void sidebar_entry_base_init (SidebarEntryIface * iface) {
+static void
+sidebar_entry_base_init (SidebarEntryIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -341,12 +372,14 @@ static void sidebar_entry_base_init (SidebarEntryIface * iface) {
 		iface->grafted = sidebar_entry_real_grafted;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		iface->pruned = sidebar_entry_real_pruned;
-#line 345 "Entry.c"
+#line 376 "Entry.c"
 	}
 }
 
 
-GType sidebar_entry_get_type (void) {
+GType
+sidebar_entry_get_type (void)
+{
 	static volatile gsize sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarEntryIface), (GBaseInitFunc) sidebar_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -359,28 +392,34 @@ GType sidebar_entry_get_type (void) {
 }
 
 
-gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self) {
+gboolean
+sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self)
+{
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_EXPANDABLE_ENTRY (self), FALSE);
 #line 28 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE (self)->expand_on_select (self);
-#line 368 "Entry.c"
+#line 403 "Entry.c"
 }
 
 
-static void sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface) {
+static void
+sidebar_expandable_entry_base_init (SidebarExpandableEntryIface * iface)
+{
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 379 "Entry.c"
+#line 416 "Entry.c"
 	}
 }
 
 
-GType sidebar_expandable_entry_get_type (void) {
+GType
+sidebar_expandable_entry_get_type (void)
+{
 	static volatile gsize sidebar_expandable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_expandable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarExpandableEntryIface), (GBaseInitFunc) sidebar_expandable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -393,19 +432,23 @@ GType sidebar_expandable_entry_get_type (void) {
 }
 
 
-static void sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface) {
+static void
+sidebar_selectable_entry_base_init (SidebarSelectableEntryIface * iface)
+{
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 404 "Entry.c"
+#line 445 "Entry.c"
 	}
 }
 
 
-GType sidebar_selectable_entry_get_type (void) {
+GType
+sidebar_selectable_entry_get_type (void)
+{
 	static volatile gsize sidebar_selectable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_selectable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarSelectableEntryIface), (GBaseInitFunc) sidebar_selectable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -418,25 +461,31 @@ GType sidebar_selectable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_page_representative_has_page (SidebarPageRepresentative* self) {
+gboolean
+sidebar_page_representative_has_page (SidebarPageRepresentative* self)
+{
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), FALSE);
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->has_page (self);
-#line 427 "Entry.c"
+#line 472 "Entry.c"
 }
 
 
-Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self) {
+Page*
+sidebar_page_representative_get_page (SidebarPageRepresentative* self)
+{
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (self), NULL);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE (self)->get_page (self);
-#line 436 "Entry.c"
+#line 483 "Entry.c"
 }
 
 
-static void sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface) {
+static void
+sidebar_page_representative_base_init (SidebarPageRepresentativeIface * iface)
+{
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -447,12 +496,14 @@ static void sidebar_page_representative_base_init (SidebarPageRepresentativeIfac
 		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 34 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		sidebar_page_representative_signals[SIDEBAR_PAGE_REPRESENTATIVE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 451 "Entry.c"
+#line 500 "Entry.c"
 	}
 }
 
 
-GType sidebar_page_representative_get_type (void) {
+GType
+sidebar_page_representative_get_type (void)
+{
 	static volatile gsize sidebar_page_representative_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_page_representative_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarPageRepresentativeIface), (GBaseInitFunc) sidebar_page_representative_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -466,25 +517,32 @@ GType sidebar_page_representative_get_type (void) {
 }
 
 
-void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name) {
+void
+sidebar_renameable_entry_rename (SidebarRenameableEntry* self,
+                                 const gchar* new_name)
+{
 #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self));
 #line 49 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->rename (self, new_name);
-#line 475 "Entry.c"
+#line 529 "Entry.c"
 }
 
 
-gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self) {
+gboolean
+sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* self)
+{
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_RENAMEABLE_ENTRY (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE (self)->is_user_renameable (self);
-#line 484 "Entry.c"
+#line 540 "Entry.c"
 }
 
 
-static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface) {
+static void
+sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * iface)
+{
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -493,12 +551,14 @@ static void sidebar_renameable_entry_base_init (SidebarRenameableEntryIface * if
 		initialized = TRUE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		sidebar_renameable_entry_signals[SIDEBAR_RENAMEABLE_ENTRY_SIDEBAR_NAME_CHANGED_SIGNAL] = g_signal_new ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 497 "Entry.c"
+#line 555 "Entry.c"
 	}
 }
 
 
-GType sidebar_renameable_entry_get_type (void) {
+GType
+sidebar_renameable_entry_get_type (void)
+{
 	static volatile gsize sidebar_renameable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_renameable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarRenameableEntryIface), (GBaseInitFunc) sidebar_renameable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -511,16 +571,20 @@ GType sidebar_renameable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self) {
+gboolean
+sidebar_emphasizable_entry_is_emphasized (SidebarEmphasizableEntry* self)
+{
 #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (self), FALSE);
 #line 58 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE (self)->is_emphasized (self);
-#line 520 "Entry.c"
+#line 582 "Entry.c"
 }
 
 
-static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface) {
+static void
+sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface * iface)
+{
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
@@ -529,12 +593,14 @@ static void sidebar_emphasizable_entry_base_init (SidebarEmphasizableEntryIface
 		initialized = TRUE;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		sidebar_emphasizable_entry_signals[SIDEBAR_EMPHASIZABLE_ENTRY_IS_EMPHASIZED_CHANGED_SIGNAL] = g_signal_new ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 533 "Entry.c"
+#line 597 "Entry.c"
 	}
 }
 
 
-GType sidebar_emphasizable_entry_get_type (void) {
+GType
+sidebar_emphasizable_entry_get_type (void)
+{
 	static volatile gsize sidebar_emphasizable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_emphasizable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarEmphasizableEntryIface), (GBaseInitFunc) sidebar_emphasizable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -547,28 +613,34 @@ GType sidebar_emphasizable_entry_get_type (void) {
 }
 
 
-void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self) {
+void
+sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self)
+{
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_DESTROYABLE_ENTRY (self));
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE (self)->destroy_source (self);
-#line 556 "Entry.c"
+#line 624 "Entry.c"
 }
 
 
-static void sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface) {
+static void
+sidebar_destroyable_entry_base_init (SidebarDestroyableEntryIface * iface)
+{
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 567 "Entry.c"
+#line 637 "Entry.c"
 	}
 }
 
 
-GType sidebar_destroyable_entry_get_type (void) {
+GType
+sidebar_destroyable_entry_get_type (void)
+{
 	static volatile gsize sidebar_destroyable_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_destroyable_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarDestroyableEntryIface), (GBaseInitFunc) sidebar_destroyable_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -581,37 +653,47 @@ GType sidebar_destroyable_entry_get_type (void) {
 }
 
 
-gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources) {
+gboolean
+sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self,
+                                                           GeeList* sources)
+{
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received (self, sources);
-#line 590 "Entry.c"
+#line 665 "Entry.c"
 }
 
 
-gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data) {
+gboolean
+sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self,
+                                                                     GtkSelectionData* data)
+{
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_val_if_fail (SIDEBAR_IS_INTERNAL_DROP_TARGET_ENTRY (self), FALSE);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	return SIDEBAR_INTERNAL_DROP_TARGET_ENTRY_GET_INTERFACE (self)->internal_drop_received_arbitrary (self, data);
-#line 599 "Entry.c"
+#line 677 "Entry.c"
 }
 
 
-static void sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+sidebar_internal_drop_target_entry_base_init (SidebarInternalDropTargetEntryIface * iface)
+{
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 610 "Entry.c"
+#line 690 "Entry.c"
 	}
 }
 
 
-GType sidebar_internal_drop_target_entry_get_type (void) {
+GType
+sidebar_internal_drop_target_entry_get_type (void)
+{
 	static volatile gsize sidebar_internal_drop_target_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_internal_drop_target_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDropTargetEntryIface), (GBaseInitFunc) sidebar_internal_drop_target_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -624,28 +706,35 @@ GType sidebar_internal_drop_target_entry_get_type (void) {
 }
 
 
-void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data) {
+void
+sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self,
+                                                           GtkSelectionData* data)
+{
 #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	g_return_if_fail (SIDEBAR_IS_INTERNAL_DRAG_SOURCE_ENTRY (self));
 #line 72 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	SIDEBAR_INTERNAL_DRAG_SOURCE_ENTRY_GET_INTERFACE (self)->prepare_selection_data (self, data);
-#line 633 "Entry.c"
+#line 718 "Entry.c"
 }
 
 
-static void sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface) {
+static void
+sidebar_internal_drag_source_entry_base_init (SidebarInternalDragSourceEntryIface * iface)
+{
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	static gboolean initialized = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 	if (!initialized) {
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Entry.vala"
 		initialized = TRUE;
-#line 644 "Entry.c"
+#line 731 "Entry.c"
 	}
 }
 
 
-GType sidebar_internal_drag_source_entry_get_type (void) {
+GType
+sidebar_internal_drag_source_entry_get_type (void)
+{
 	static volatile gsize sidebar_internal_drag_source_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_internal_drag_source_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarInternalDragSourceEntryIface), (GBaseInitFunc) sidebar_internal_drag_source_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index 7a44e33..fcafa8d 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.36.6, the Vala compiler
+/* Sidebar.c generated by valac 0.40.4, the Vala compiler
  * generated from Sidebar.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -17,11 +18,15 @@ void sidebar_init (GError** error);
 void sidebar_terminate (void);
 
 
-void sidebar_init (GError** error) {
+void
+sidebar_init (GError** error)
+{
 }
 
 
-void sidebar_terminate (void) {
+void
+sidebar_terminate (void)
+{
 }
 
 
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index 1345227..edb6a3f 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.36.6, the Vala compiler
+/* Tree.c generated by valac 0.40.4, the Vala compiler
  * generated from Tree.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -58,10 +59,15 @@ typedef struct _SidebarTreeEntryWrapperClass SidebarTreeEntryWrapperClass;
 
 typedef struct _SidebarBranch SidebarBranch;
 typedef struct _SidebarBranchClass SidebarBranchClass;
+enum  {
+	SIDEBAR_TREE_0_PROPERTY,
+	SIDEBAR_TREE_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_tree_properties[SIDEBAR_TREE_NUM_PROPERTIES];
 
 #define SIDEBAR_TREE_TYPE_COLUMNS (sidebar_tree_columns_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _gtk_tree_row_reference_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_row_reference_free (var), NULL)))
+#define __vala_GtkTreeRowReference_free0(var) ((var == NULL) ? NULL : (var = (_vala_GtkTreeRowReference_free (var), NULL)))
 
 #define LIBRARY_WINDOW_TYPE_TARGET_TYPE (library_window_target_type_get_type ())
 typedef struct _SidebarTreeEntryWrapperPrivate SidebarTreeEntryWrapperPrivate;
@@ -85,7 +91,7 @@ typedef struct _SidebarGroupingClass SidebarGroupingClass;
 
 typedef struct _SidebarHeader SidebarHeader;
 typedef struct _SidebarHeaderClass SidebarHeaderClass;
-#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)))
+#define __vala_GtkTreePath_free0(var) ((var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_APPLICATION (application_get_type ())
@@ -99,7 +105,7 @@ typedef struct _Application Application;
 typedef struct _ApplicationClass ApplicationClass;
 #define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define __g_list_free__gtk_tree_path_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__gtk_tree_path_free0_ (var), NULL)))
+#define __g_list_free___vala_GtkTreePath_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free___vala_GtkTreePath_free0_ (var), NULL)))
 
 #define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
 #define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
@@ -325,6 +331,16 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 typedef struct _Tag Tag;
 typedef struct _TagClass TagClass;
 enum  {
+	SIDEBAR_TREE_ENTRY_WRAPPER_0_PROPERTY,
+	SIDEBAR_TREE_ENTRY_WRAPPER_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_tree_entry_wrapper_properties[SIDEBAR_TREE_ENTRY_WRAPPER_NUM_PROPERTIES];
+enum  {
+	SIDEBAR_TREE_ROOT_WRAPPER_0_PROPERTY,
+	SIDEBAR_TREE_ROOT_WRAPPER_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_tree_root_wrapper_properties[SIDEBAR_TREE_ROOT_WRAPPER_NUM_PROPERTIES];
+enum  {
 	SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL,
 	SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL,
 	SIDEBAR_TREE_BRANCH_ADDED_SIGNAL,
@@ -332,9 +348,9 @@ enum  {
 	SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL,
 	SIDEBAR_TREE_PAGE_CREATED_SIGNAL,
 	SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL,
-	SIDEBAR_TREE_LAST_SIGNAL
+	SIDEBAR_TREE_NUM_SIGNALS
 };
-static guint sidebar_tree_signals[SIDEBAR_TREE_LAST_SIGNAL] = {0};
+static guint sidebar_tree_signals[SIDEBAR_TREE_NUM_SIGNALS] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -473,67 +489,146 @@ GType sidebar_entry_get_type (void) G_GNUC_CONST;
 static GType sidebar_tree_entry_wrapper_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_TREE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_TREE, SidebarTreePrivate))
-enum  {
-	SIDEBAR_TREE_DUMMY_PROPERTY
-};
 static void sidebar_tree_on_editing_canceled (SidebarTree* self);
-static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self);
-static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path);
-static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self);
+static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender,
+                                                                           gpointer self);
+static void sidebar_tree_on_editing_started (SidebarTree* self,
+                                      GtkCellEditable* editable,
+                                      const gchar* path);
+static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender,
+                                                                         GtkCellEditable* editable,
+                                                                         const gchar* path,
+                                                                         gpointer self);
 static GType sidebar_tree_columns_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+static void _vala_GtkTreeRowReference_free (GtkTreeRowReference* self);
 #define SIDEBAR_TREE_ICON_SIZE 16
 static void sidebar_tree_on_new_tag (SidebarTree* self);
-static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self);
 static void sidebar_tree_on_new_search (SidebarTree* self);
-static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter);
-static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self);
-static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected);
-static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self);
-gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path);
-static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
-static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
+static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self);
+SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries,
+                               int target_entries_length1,
+                               GdkDragAction actions,
+                               SidebarTreeExternalDropHandler drop_handler,
+                               void* drop_handler_target);
+SidebarTree* sidebar_tree_construct (GType object_type,
+                                     GtkTargetEntry* target_entries,
+                                     int target_entries_length1,
+                                     GdkDragAction actions,
+                                     SidebarTreeExternalDropHandler drop_handler,
+                                     void* drop_handler_target);
+void sidebar_tree_icon_renderer_function (SidebarTree* self,
+                                          GtkCellLayout* layout,
+                                          GtkCellRenderer* renderer,
+                                          GtkTreeModel* model,
+                                          GtkTreeIter* iter);
+static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout,
+                                                                     GtkCellRenderer* cell,
+                                                                     GtkTreeModel* tree_model,
+                                                                     GtkTreeIter* iter,
+                                                                     gpointer self);
+static gboolean sidebar_tree_on_selection (SidebarTree* self,
+                                    GtkTreeSelection* selection,
+                                    GtkTreeModel* model,
+                                    GtkTreePath* path,
+                                    gboolean path_currently_selected);
+static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection,
+                                                             GtkTreeModel* model,
+                                                             GtkTreePath* path,
+                                                             gboolean path_currently_selected,
+                                                             gpointer self);
+gboolean sidebar_tree_on_toggle_row (SidebarTree* self,
+                                     GtkTreeIter* iter,
+                                     GtkTreePath* path);
+static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender,
+                                                                    GtkTreeIter* iter,
+                                                                    GtkTreePath* path,
+                                                                    gpointer self);
+static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender,
+                                                                      GtkTreeIter* iter,
+                                                                      GtkTreePath* path,
+                                                                      gpointer self);
 GType library_window_target_type_get_type (void) G_GNUC_CONST;
-static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value);
+static void _vala_array_add67 (GtkTargetEntry* * array,
+                        int* length,
+                        int* size,
+                        const GtkTargetEntry* value);
 static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self);
-static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
+static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender,
+                                                                       gpointer self);
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self);
-static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx);
-static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self);
-static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx);
-static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self);
-static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_);
-static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self);
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter);
+static void sidebar_tree_on_drag_begin (SidebarTree* self,
+                                 GdkDragContext* ctx);
+static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender,
+                                                        GdkDragContext* context,
+                                                        gpointer self);
+static void sidebar_tree_on_drag_end (SidebarTree* self,
+                               GdkDragContext* ctx);
+static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender,
+                                                    GdkDragContext* context,
+                                                    gpointer self);
+static gboolean sidebar_tree_on_drag_motion (SidebarTree* self,
+                                      GdkDragContext* context,
+                                      gint x,
+                                      gint y,
+                                      guint time_);
+static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender,
+                                                              GdkDragContext* context,
+                                                              gint x,
+                                                              gint y,
+                                                              guint time_,
+                                                              gpointer self);
+static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self,
+                                                           GtkTreeIter* iter);
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path);
+static void _vala_GtkTreePath_free (GtkTreePath* self);
+static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self,
+                                                           GtkTreePath* path);
 gchar* resources_get_ui (const gchar* filename);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
+GParamSpec* param_spec_application (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_application (GValue* value,
+                            gpointer v_object);
+void value_take_application (GValue* value,
+                             gpointer v_object);
 gpointer value_get_application (const GValue* value);
 GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
-static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry);
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry);
+static gboolean sidebar_tree_has_wrapper (SidebarTree* self,
+                                   SidebarEntry* entry);
+static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self,
+                                                   SidebarEntry* entry);
 gchar* sidebar_entry_to_string (SidebarEntry* self);
-gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal);
-gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry);
+gboolean sidebar_tree_place_cursor (SidebarTree* self,
+                                    SidebarEntry* entry,
+                                    gboolean mask_signal);
+gboolean sidebar_tree_expand_to_entry (SidebarTree* self,
+                                       SidebarEntry* entry);
 static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self);
-gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry);
-gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry);
+gboolean sidebar_tree_scroll_to_entry (SidebarTree* self,
+                                       SidebarEntry* entry);
+gboolean sidebar_tree_is_selected (SidebarTree* self,
+                                   SidebarEntry* entry);
 gboolean sidebar_tree_is_any_selected (SidebarTree* self);
 static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self);
-static void _gtk_tree_path_free0_ (gpointer var);
-static void _g_list_free__gtk_tree_path_free0_ (GList* self);
-static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry);
+static GtkTreePath* _vala_GtkTreePath_copy (GtkTreePath* self);
+static void __vala_GtkTreePath_free0_ (gpointer var);
+static inline void _g_list_free___vala_GtkTreePath_free0_ (GList* self);
+static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self,
+                                        SidebarEntry* entry);
 gchar* guarded_markup_escape_text (const gchar* plain);
 gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self);
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -546,102 +641,229 @@ gboolean sidebar_renameable_entry_is_user_renameable (SidebarRenameableEntry* se
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 void sidebar_tree_disable_editing (SidebarTree* self);
 void sidebar_tree_enable_editing (SidebarTree* self);
-void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all);
-void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry);
-void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position);
+void sidebar_tree_toggle_branch_expansion (SidebarTree* self,
+                                           GtkTreePath* path,
+                                           gboolean expand_all);
+void sidebar_tree_expand_to_first_child (SidebarTree* self,
+                                         SidebarEntry* entry);
+void sidebar_tree_graft (SidebarTree* self,
+                         SidebarBranch* branch,
+                         gint position);
 gboolean sidebar_branch_get_show_branch (SidebarBranch* self);
-static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch);
+static void sidebar_tree_associate_branch (SidebarTree* self,
+                                    SidebarBranch* branch);
 gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self);
-static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry);
-static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self);
-static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry);
-static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self);
-static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry);
-static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self);
-static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent);
-static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self);
-static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry);
-static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self);
-static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown);
-static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self);
+static void sidebar_tree_on_branch_entry_added (SidebarTree* self,
+                                         SidebarBranch* branch,
+                                         SidebarEntry* entry);
+static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender,
+                                                                     SidebarEntry* entry,
+                                                                     gpointer self);
+static void sidebar_tree_on_branch_entry_removed (SidebarTree* self,
+                                           SidebarBranch* branch,
+                                           SidebarEntry* entry);
+static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender,
+                                                                         SidebarEntry* entry,
+                                                                         gpointer self);
+static void sidebar_tree_on_branch_entry_moved (SidebarTree* self,
+                                         SidebarBranch* branch,
+                                         SidebarEntry* entry);
+static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender,
+                                                                     SidebarEntry* entry,
+                                                                     gpointer self);
+static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self,
+                                              SidebarBranch* branch,
+                                              SidebarEntry* entry,
+                                              SidebarEntry* old_parent);
+static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender,
+                                                                               SidebarEntry* entry,
+                                                                               SidebarEntry* old_parent,
+                                                                               gpointer self);
+static void sidebar_tree_on_branch_children_reordered (SidebarTree* self,
+                                                SidebarBranch* branch,
+                                                SidebarEntry* entry);
+static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender,
+                                                                                   SidebarEntry* entry,
+                                                                                   gpointer self);
+static void sidebar_tree_on_show_branch (SidebarTree* self,
+                                  SidebarBranch* branch,
+                                  gboolean shown);
+static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender,
+                                                              gboolean show,
+                                                              gpointer self);
 static GType sidebar_tree_root_wrapper_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self);
-static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper);
-static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position);
-static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position);
-static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter);
-GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent);
-static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry);
-static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path);
-static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path);
+static void sidebar_tree_associate_wrapper (SidebarTree* self,
+                                     GtkTreeIter* assoc_iter,
+                                     SidebarTreeEntryWrapper* wrapper);
+static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model,
+                                                       SidebarEntry* entry,
+                                                       GtkTreePath* path,
+                                                       gint root_position);
+static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type,
+                                                             GtkTreeModel* model,
+                                                             SidebarEntry* entry,
+                                                             GtkTreePath* path,
+                                                             gint root_position);
+static void sidebar_tree_associate_children (SidebarTree* self,
+                                      SidebarBranch* branch,
+                                      SidebarEntry* parent,
+                                      GtkTreeIter* parent_iter);
+GeeList* sidebar_branch_get_children (SidebarBranch* self,
+                                      SidebarEntry* parent);
+static void sidebar_tree_associate_entry (SidebarTree* self,
+                                   GtkTreeIter* assoc_iter,
+                                   SidebarEntry* entry);
+static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model,
+                                                         SidebarEntry* entry,
+                                                         GtkTreePath* path);
+static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type,
+                                                               GtkTreeModel* model,
+                                                               SidebarEntry* entry,
+                                                               GtkTreePath* path);
 gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self);
-static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter);
-static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip);
-static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self);
-static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name);
-static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self);
+static void sidebar_tree_load_entry_icons (SidebarTree* self,
+                                    GtkTreeIter* iter);
+static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self,
+                                              SidebarEntry* entry,
+                                              const gchar* tooltip);
+static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender,
+                                                                                     const gchar* tooltip,
+                                                                                     gpointer self);
+static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self,
+                                           SidebarEntry* entry,
+                                           const gchar* icon_name);
+static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender,
+                                                                               const gchar* icon,
+                                                                               gpointer self);
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
-static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page);
-static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self);
-static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page);
-static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self);
-static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized);
-static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self);
-static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name);
-static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self);
-void sidebar_entry_grafted (SidebarEntry* self, SidebarTree* tree);
-static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper);
-void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch);
-static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch);
-static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children);
-static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children);
-static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result);
-void sidebar_entry_pruned (SidebarEntry* self, SidebarTree* tree);
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
-SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry);
+static void sidebar_tree_on_sidebar_page_created (SidebarTree* self,
+                                           SidebarPageRepresentative* entry,
+                                           Page* page);
+static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender,
+                                                                                     Page* page,
+                                                                                     gpointer self);
+static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self,
+                                              SidebarPageRepresentative* entry,
+                                              Page* page);
+static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender,
+                                                                                           Page* page,
+                                                                                           gpointer self);
+static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self,
+                                            SidebarEmphasizableEntry* entry,
+                                            gboolean is_emphasized);
+static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender,
+                                                                                              gboolean emphasized,
+                                                                                              gpointer self);
+static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self,
+                                           SidebarEntry* entry,
+                                           const gchar* name);
+static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender,
+                                                                                          const gchar* name,
+                                                                                          gpointer self);
+void sidebar_entry_grafted (SidebarEntry* self,
+                            SidebarTree* tree);
+static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self,
+                                                        GtkTreeIter* new_iter,
+                                                        SidebarTreeEntryWrapper* current_wrapper);
+void sidebar_tree_prune (SidebarTree* self,
+                         SidebarBranch* branch);
+static void sidebar_tree_disassociate_branch (SidebarTree* self,
+                                       SidebarBranch* branch);
+static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self,
+                                                   SidebarTreeEntryWrapper* wrapper,
+                                                   gboolean only_children);
+static void sidebar_tree_disassociate_wrapper (SidebarTree* self,
+                                        SidebarTreeEntryWrapper* wrapper,
+                                        gboolean only_children);
+static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
+                                          GtkTreeIter* result);
+void sidebar_entry_pruned (SidebarEntry* self,
+                           SidebarTree* tree);
+SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self,
+                                         SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self,
+                                               SidebarEntry* entry);
 gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self);
-SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self,
+                                                   SidebarEntry* entry);
 static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self);
-static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry);
+static void sidebar_tree_rename_entry (SidebarTree* self,
+                                SidebarEntry* entry);
 gchar* sidebar_entry_get_sidebar_icon (SidebarEntry* self);
-static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter);
-static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEventButton* event);
-static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event);
+static void sidebar_tree_load_branch_icons (SidebarTree* self,
+                                     GtkTreeIter* iter);
+static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self,
+                                               GdkEventButton* event);
+static gboolean sidebar_tree_popup_context_menu (SidebarTree* self,
+                                          GtkTreePath* path,
+                                          GdkEventButton* event);
 GType sidebar_contextable_get_type (void) G_GNUC_CONST;
-GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event);
-static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event);
-static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventButton* event);
+GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self,
+                                                       GdkEventButton* event);
+static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self,
+                                                  GdkEventButton* event);
+static gboolean sidebar_tree_real_button_press_event (GtkWidget* base,
+                                               GdkEventButton* event);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
-gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event);
-static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self,
+                                               GdkEventKey* event);
+static gboolean sidebar_tree_real_key_press_event (GtkWidget* base,
+                                            GdkEventKey* event);
 static gboolean sidebar_tree_rename_in_place (SidebarTree* self);
-static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path);
-gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry);
-static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path);
-static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time);
+static gboolean sidebar_tree_destroy_path (SidebarTree* self,
+                                    GtkTreePath* path);
+gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self,
+                                             SidebarEntry* entry);
+static gboolean sidebar_tree_can_rename_path (SidebarTree* self,
+                                       GtkTreePath* path);
+static void sidebar_tree_real_drag_data_get (GtkWidget* base,
+                                      GdkDragContext* context,
+                                      GtkSelectionData* selection_data,
+                                      guint info,
+                                      guint time);
 GType sidebar_internal_drag_source_entry_get_type (void) G_GNUC_CONST;
-void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self, GtkSelectionData* data);
-static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time);
+void sidebar_internal_drag_source_entry_prepare_selection_data (SidebarInternalDragSourceEntry* self,
+                                                                GtkSelectionData* data);
+static void sidebar_tree_real_drag_data_received (GtkWidget* base,
+                                           GdkDragContext* context,
+                                           gint x,
+                                           gint y,
+                                           GtkSelectionData* selection_data,
+                                           guint info,
+                                           guint time);
 #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path"
-gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self, GtkSelectionData* data);
-GeeList* unserialize_media_sources (guchar* serialized, gint size);
-gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self, GeeList* sources);
-static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* self,
+                                                                              GtkSelectionData* data);
+GeeList* unserialize_media_sources (guchar* serialized,
+                                    gint size);
+gboolean sidebar_internal_drop_target_entry_internal_drop_received (SidebarInternalDropTargetEntry* self,
+                                                                    GeeList* sources);
+static gboolean sidebar_tree_real_drag_motion (GtkWidget* base,
+                                        GdkDragContext* context,
+                                        gint x,
+                                        gint y,
+                                        guint time);
 GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST;
 void sidebar_destroyable_entry_destroy_source (SidebarDestroyableEntry* self);
 static void sidebar_tree_on_editing_done (SidebarTree* self);
-static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self);
-static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event);
-static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
-void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name);
+static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender,
+                                                                   gpointer self);
+static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self,
+                                            GdkEventFocus* event);
+static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                                        GdkEventFocus* event,
+                                                                        gpointer self);
+void sidebar_renameable_entry_rename (SidebarRenameableEntry* self,
+                                      const gchar* new_name);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
@@ -653,49 +875,71 @@ NewRootTagCommand* new_root_tag_command_new (void);
 NewRootTagCommand* new_root_tag_command_construct (GType object_type);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* app_window_get_command_manager (void);
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 GType tag_get_type (void) G_GNUC_CONST;
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
+void library_window_rename_tag_in_sidebar (LibraryWindow* self,
+                                           Tag* tag);
 Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self);
-static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum  {
-	SIDEBAR_TREE_ENTRY_WRAPPER_DUMMY_PROPERTY
-};
+static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure,
+                                                   GValue * return_value,
+                                                   guint n_param_values,
+                                                   const GValue * param_values,
+                                                   gpointer invocation_hint,
+                                                   gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
 static void sidebar_tree_entry_wrapper_finalize (GObject * obj);
-enum  {
-	SIDEBAR_TREE_ROOT_WRAPPER_DUMMY_PROPERTY
-};
 static void sidebar_tree_root_wrapper_finalize (GObject * obj);
 static void sidebar_tree_finalize (GObject * obj);
 
 static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}};
 
-static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
+static void
+_sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender,
+                                                                      gpointer self)
+{
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 688 "Tree.c"
+#line 925 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
+static void
+_sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender,
+                                                                    GtkCellEditable* editable,
+                                                                    const gchar* path,
+                                                                    gpointer self)
+{
 #line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 695 "Tree.c"
+#line 937 "Tree.c"
 }
 
 
-static GType sidebar_tree_columns_get_type (void) {
+static GType
+sidebar_tree_columns_get_type (void)
+{
 	static volatile gsize sidebar_tree_columns_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_tree_columns_type_id__volatile)) {
 		static const GEnumValue values[] = {{SIDEBAR_TREE_COLUMNS_NAME, "SIDEBAR_TREE_COLUMNS_NAME", "name"}, {SIDEBAR_TREE_COLUMNS_TOOLTIP, "SIDEBAR_TREE_COLUMNS_TOOLTIP", "tooltip"}, {SIDEBAR_TREE_COLUMNS_WRAPPER, "SIDEBAR_TREE_COLUMNS_WRAPPER", "wrapper"}, {SIDEBAR_TREE_COLUMNS_ICON, "SIDEBAR_TREE_COLUMNS_ICON", "icon"}, {SIDEBAR_TREE_COLUMNS_N_COLUMNS, "SIDEBAR_TREE_COLUMNS_N_COLUMNS", "n-columns"}, {0, NULL, NULL}};
@@ -707,109 +951,180 @@ static GType sidebar_tree_columns_get_type (void) {
 }
 
 
-static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_vala_GtkTreeRowReference_free (GtkTreeRowReference* self)
+{
+#line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_boxed_free (gtk_tree_row_reference_get_type (), self);
+#line 960 "Tree.c"
+}
+
+
+static void
+_sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                           GVariant* parameter,
+                                                           gpointer self)
+{
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 714 "Tree.c"
+#line 971 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self)
+{
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 721 "Tree.c"
+#line 982 "Tree.c"
 }
 
 
-static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
+static void
+_sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout,
+                                                                GtkCellRenderer* cell,
+                                                                GtkTreeModel* tree_model,
+                                                                GtkTreeIter* iter,
+                                                                gpointer self)
+{
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 728 "Tree.c"
+#line 995 "Tree.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 735 "Tree.c"
+#line 1004 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self) {
+static gboolean
+_sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection,
+                                                    GtkTreeModel* model,
+                                                    GtkTreePath* path,
+                                                    gboolean path_currently_selected,
+                                                    gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
 #line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 744 "Tree.c"
+#line 1019 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
+static gboolean
+_sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender,
+                                                           GtkTreeIter* iter,
+                                                           GtkTreePath* path,
+                                                           gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 753 "Tree.c"
+#line 1033 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
+static gboolean
+_sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender,
+                                                             GtkTreeIter* iter,
+                                                             GtkTreePath* path,
+                                                             gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 762 "Tree.c"
+#line 1047 "Tree.c"
 }
 
 
-static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) {
+static void
+_vala_array_add67 (GtkTargetEntry* * array,
+                   int* length,
+                   int* size,
+                   const GtkTargetEntry* value)
+{
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((*length) == (*size)) {
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 773 "Tree.c"
+#line 1063 "Tree.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 777 "Tree.c"
+#line 1067 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
+static gboolean
+_sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender,
+                                                              gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
 #line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 786 "Tree.c"
+#line 1079 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
+static void
+_sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender,
+                                                   GdkDragContext* context,
+                                                   gpointer self)
+{
 #line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 793 "Tree.c"
+#line 1090 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
+static void
+_sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender,
+                                               GdkDragContext* context,
+                                               gpointer self)
+{
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 800 "Tree.c"
+#line 1101 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) {
+static gboolean
+_sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender,
+                                                     GdkDragContext* context,
+                                                     gint x,
+                                                     gint y,
+                                                     guint time_,
+                                                     gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
 #line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 809 "Tree.c"
+#line 1117 "Tree.c"
 }
 
 
-SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
+SidebarTree*
+sidebar_tree_construct (GType object_type,
+                        GtkTargetEntry* target_entries,
+                        int target_entries_length1,
+                        GdkDragAction actions,
+                        SidebarTreeExternalDropHandler drop_handler,
+                        void* drop_handler_target)
+{
 	SidebarTree * self = NULL;
 	GtkTreeStore* _tmp0_;
 	GtkTreeViewColumn* text_column = NULL;
@@ -829,28 +1144,21 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	GtkTreeSelection* selection = NULL;
 	GtkTreeSelection* _tmp11_;
 	GtkTreeSelection* _tmp12_;
-	GtkTargetEntry* _tmp13_;
-	gint _tmp13__length1;
-	GdkDragAction _tmp14_;
 	GtkTargetEntry* source_entries = NULL;
-	GtkTargetEntry* _tmp15_;
+	GtkTargetEntry* _tmp13_;
 	gint source_entries_length1;
 	gint _source_entries_size_;
+	GtkTargetEntry* _tmp14_;
+	gint _tmp14__length1;
+	GtkTargetEntry _tmp15_;
 	GtkTargetEntry* _tmp16_;
 	gint _tmp16__length1;
-	GtkTargetEntry* _tmp17_;
-	gint _tmp17__length1;
-	GtkTargetEntry _tmp18_;
-	GtkTargetEntry* _tmp19_;
-	gint _tmp19__length1;
-	SidebarTreeExternalDropHandler _tmp20_;
-	void* _tmp20__target;
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = (SidebarTree*) g_object_new (object_type, NULL);
 #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
 #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+	gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel));
 #line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_view_column_new ();
 #line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -868,11 +1176,11 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 #line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (icon_renderer, "follow-state", TRUE, NULL);
 #line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
 #line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
+	gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -896,11 +1204,11 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = self->priv->text_renderer;
 #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = self->priv->text_renderer;
 #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME);
 #line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), text_column);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -916,7 +1224,7 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	page_holder = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_column_set_visible (page_holder, FALSE);
 #line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -950,47 +1258,33 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-collapse-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row, self, 0);
 #line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = target_entries;
-#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13__length1 = target_entries_length1;
-#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = actions;
-#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_, _tmp13__length1, _tmp14_);
+	gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), target_entries, target_entries_length1, actions);
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = g_new0 (GtkTargetEntry, 0);
+	_tmp13_ = g_new0 (GtkTargetEntry, 0);
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	source_entries = _tmp15_;
+	source_entries = _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	source_entries_length1 = 0;
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_source_entries_size_ = source_entries_length1;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = source_entries;
-#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16__length1 = source_entries_length1;
-#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = target_entries;
+	_tmp14_ = source_entries;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17__length1 = target_entries_length1;
+	_tmp14__length1 = source_entries_length1;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = _tmp17_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH];
+	_tmp15_ = target_entries[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH];
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp18_);
+	_vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp15_);
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = source_entries;
+	_tmp16_ = source_entries;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19__length1 = source_entries_length1;
+	_tmp16__length1 = source_entries_length1;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp19_, _tmp19__length1, GDK_ACTION_COPY);
-#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = drop_handler;
+	gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp16_, _tmp16__length1, GDK_ACTION_COPY);
 #line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20__target = drop_handler_target;
+	self->priv->drop_handler = drop_handler;
 #line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->drop_handler = _tmp20_;
-#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->drop_handler_target = _tmp20__target;
+	self->priv->drop_handler_target = drop_handler_target;
 #line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu, self, 0);
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1015,25 +1309,36 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	_g_object_unref0 (text_column);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 1019 "Tree.c"
+#line 1313 "Tree.c"
 }
 
 
-SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
+SidebarTree*
+sidebar_tree_new (GtkTargetEntry* target_entries,
+                  int target_entries_length1,
+                  GdkDragAction actions,
+                  SidebarTreeExternalDropHandler drop_handler,
+                  void* drop_handler_target)
+{
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1026 "Tree.c"
+#line 1326 "Tree.c"
 }
 
 
-void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter) {
+void
+sidebar_tree_icon_renderer_function (SidebarTree* self,
+                                     GtkCellLayout* layout,
+                                     GtkCellRenderer* renderer,
+                                     GtkTreeModel* model,
+                                     GtkTreeIter* iter)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GtkTreeIter _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	GtkCellRenderer* _tmp3_;
-	SidebarTreeEntryWrapper* _tmp4_;
-	SidebarEntry* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarEntry* _tmp4_;
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1058,34 +1363,38 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 		_g_object_unref0 (wrapper);
 #line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1062 "Tree.c"
+#line 1367 "Tree.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = renderer;
-#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = wrapper;
+	_tmp3_ = wrapper;
 #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_->entry;
+	_tmp4_ = _tmp3_->entry;
 #line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
+	gtk_cell_renderer_set_visible (renderer, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_HEADER));
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1074 "Tree.c"
+#line 1377 "Tree.c"
 }
 
 
-static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx) {
+static void
+sidebar_tree_on_drag_begin (SidebarTree* self,
+                            GdkDragContext* ctx)
+{
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
 #line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1085 "Tree.c"
+#line 1391 "Tree.c"
 }
 
 
-static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
+static void
+sidebar_tree_on_drag_end (SidebarTree* self,
+                          GdkDragContext* ctx)
+{
 #line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1096,11 +1405,26 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1100 "Tree.c"
+#line 1409 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext* context, gint x, gint y, guint time_) {
+static void
+_vala_GtkTreePath_free (GtkTreePath* self)
+{
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_boxed_free (gtk_tree_path_get_type (), self);
+#line 1418 "Tree.c"
+}
+
+
+static gboolean
+sidebar_tree_on_drag_motion (SidebarTree* self,
+                             GdkDragContext* context,
+                             gint x,
+                             gint y,
+                             guint time_)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
@@ -1112,96 +1436,92 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1116 "Tree.c"
+#line 1440 "Tree.c"
 		SidebarEntry* _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = self->priv->internal_drag_source_entry;
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1122 "Tree.c"
+#line 1446 "Tree.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1126 "Tree.c"
+#line 1450 "Tree.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1130 "Tree.c"
+#line 1454 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
-		gint _tmp3_;
-		gint _tmp4_;
-		GtkTreePath* _tmp5_ = NULL;
-		GtkTreeViewDropPosition _tmp6_ = 0;
-		GtkTreePath* _tmp7_;
-#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = x;
-#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = y;
+		GtkTreePath* _tmp3_ = NULL;
+		GtkTreeViewDropPosition _tmp4_ = 0;
+		GtkTreePath* _tmp5_;
 #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
+		gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp3_, &_tmp4_);
 #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		path = _tmp5_;
+		path = _tmp3_;
 #line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		position = _tmp6_;
+		position = _tmp4_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = path;
+		_tmp5_ = path;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp7_ != NULL) {
-#line 1154 "Tree.c"
+		if (_tmp5_ != NULL) {
+#line 1472 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
-			GtkTreePath* _tmp8_;
-			SidebarTreeEntryWrapper* _tmp9_;
-			SidebarTreeEntryWrapper* _tmp10_;
+			GtkTreePath* _tmp6_;
+			SidebarTreeEntryWrapper* _tmp7_;
+			SidebarTreeEntryWrapper* _tmp8_;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp8_ = path;
+			_tmp6_ = path;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp9_ = sidebar_tree_get_wrapper_at_path (self, _tmp8_);
+			_tmp7_ = sidebar_tree_get_wrapper_at_path (self, _tmp6_);
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			wrapper = _tmp9_;
+			wrapper = _tmp7_;
 #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp10_ = wrapper;
+			_tmp8_ = wrapper;
 #line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp10_ != NULL) {
-#line 1169 "Tree.c"
-				SidebarTreeEntryWrapper* _tmp11_;
-				SidebarEntry* _tmp12_;
-				SidebarEntry* _tmp13_;
+			if (_tmp8_ != NULL) {
+#line 1487 "Tree.c"
+				SidebarTreeEntryWrapper* _tmp9_;
+				SidebarEntry* _tmp10_;
+				SidebarEntry* _tmp11_;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp11_ = wrapper;
+				_tmp9_ = wrapper;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp12_ = _tmp11_->entry;
+				_tmp10_ = _tmp9_->entry;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp13_ = _g_object_ref0 (_tmp12_);
+				_tmp11_ = _g_object_ref0 (_tmp10_);
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1183 "Tree.c"
+				self->priv->internal_drag_source_entry = _tmp11_;
+#line 1501 "Tree.c"
 			}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1187 "Tree.c"
+#line 1505 "Tree.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
-#line 1191 "Tree.c"
+		__vala_GtkTreePath_free0 (path);
+#line 1509 "Tree.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
 #line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1197 "Tree.c"
+#line 1515 "Tree.c"
 }
 
 
-static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
+static void
+sidebar_tree_setup_default_context_menu (SidebarTree* self)
+{
 	GError * _inner_error_ = NULL;
 #line 197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1205 "Tree.c"
+#line 1525 "Tree.c"
 	{
 		GtkBuilder* _tmp0_;
 		gchar* _tmp1_;
@@ -1229,7 +1549,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_free0 (_tmp2_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1233 "Tree.c"
+#line 1553 "Tree.c"
 			goto __catch55_g_error;
 		}
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1270,7 +1590,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_object_unref0 (group);
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 1274 "Tree.c"
+#line 1594 "Tree.c"
 	}
 	goto __finally55;
 	__catch55_g_error:
@@ -1308,7 +1628,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_application_unref0 (_tmp17_);
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (_error_);
-#line 1312 "Tree.c"
+#line 1632 "Tree.c"
 	}
 	__finally55:
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1319,16 +1639,17 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		g_clear_error (&_inner_error_);
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1323 "Tree.c"
+#line 1643 "Tree.c"
 	}
 }
 
 
-static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry) {
+static gboolean
+sidebar_tree_has_wrapper (SidebarTree* self,
+                          SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1336,24 +1657,22 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
 #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = entry;
-#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp2_;
+	result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1347 "Tree.c"
+#line 1664 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, SidebarEntry* entry) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_get_wrapper (SidebarTree* self,
+                          SidebarEntry* entry)
+{
 	SidebarTreeEntryWrapper* result = NULL;
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
+	gpointer _tmp1_;
+	SidebarTreeEntryWrapper* _tmp2_;
 #line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1361,40 +1680,38 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
 #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = entry;
-#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = (SidebarTreeEntryWrapper*) _tmp2_;
+	wrapper = (SidebarTreeEntryWrapper*) _tmp1_;
 #line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ == NULL) {
-#line 1374 "Tree.c"
-		SidebarEntry* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = entry;
+	if (_tmp2_ == NULL) {
+#line 1691 "Tree.c"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = sidebar_entry_to_string (_tmp4_);
+		_tmp3_ = sidebar_entry_to_string (entry);
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp6_);
+		g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp4_);
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp6_);
-#line 1388 "Tree.c"
+		_g_free0 (_tmp4_);
+#line 1702 "Tree.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
 #line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1394 "Tree.c"
+#line 1708 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* self, GtkTreeIter* iter) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_get_wrapper_at_iter (SidebarTree* self,
+                                  GtkTreeIter* iter)
+{
 	SidebarTreeEntryWrapper* result = NULL;
 	GValue val = {0};
 	GtkTreeStore* _tmp0_;
@@ -1413,7 +1730,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = *iter;
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_);
+	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_);
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1428,7 +1745,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	_tmp5_ = wrapper;
 #line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1432 "Tree.c"
+#line 1749 "Tree.c"
 		GtkTreeStore* _tmp6_;
 		GtkTreeIter _tmp7_;
 		GtkTreePath* _tmp8_;
@@ -1440,7 +1757,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = *iter;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
+		_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp7_);
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp8_;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1452,8 +1769,8 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp11_);
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (_tmp9_);
-#line 1457 "Tree.c"
+		__vala_GtkTreePath_free0 (_tmp9_);
+#line 1774 "Tree.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
@@ -1461,19 +1778,21 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1465 "Tree.c"
+#line 1782 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_get_wrapper_at_path (SidebarTree* self,
+                                  GtkTreePath* path)
+{
 	SidebarTreeEntryWrapper* result = NULL;
 	GtkTreeIter iter = {0};
 	GtkTreeStore* _tmp0_;
-	GtkTreePath* _tmp1_;
-	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_;
-	GtkTreeIter _tmp7_;
-	SidebarTreeEntryWrapper* _tmp8_;
+	GtkTreeIter _tmp1_ = {0};
+	gboolean _tmp2_;
+	GtkTreeIter _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1481,170 +1800,151 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
 #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = path;
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
+	_tmp2_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp1_, path);
 #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	iter = _tmp2_;
+	iter = _tmp1_;
 #line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp3_) {
-#line 1492 "Tree.c"
-		GtkTreePath* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = path;
+	if (!_tmp2_) {
+#line 1809 "Tree.c"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = gtk_tree_path_to_string (_tmp4_);
+		_tmp3_ = gtk_tree_path_to_string (path);
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp6_);
+		g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp4_);
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp4_);
 #line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
 #line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1510 "Tree.c"
+#line 1824 "Tree.c"
 	}
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = iter;
+	_tmp5_ = iter;
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
+	_tmp6_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp5_);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp8_;
+	result = _tmp6_;
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1520 "Tree.c"
+#line 1834 "Tree.c"
 }
 
 
-gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal) {
+gboolean
+sidebar_tree_place_cursor (SidebarTree* self,
+                           SidebarEntry* entry,
+                           gboolean mask_signal)
+{
 	gboolean result = FALSE;
-	SidebarEntry* _tmp0_;
-	gboolean _tmp1_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp1_;
+	GtkTreeSelection* _tmp2_;
 	SidebarTreeEntryWrapper* _tmp3_;
-	SidebarTreeEntryWrapper* _tmp4_;
-	GtkTreeSelection* _tmp5_;
+	GtkTreePath* _tmp4_;
+	GtkTreePath* _tmp5_;
 	SidebarTreeEntryWrapper* _tmp6_;
 	GtkTreePath* _tmp7_;
 	GtkTreePath* _tmp8_;
-	gboolean _tmp9_;
-	SidebarTreeEntryWrapper* _tmp10_;
-	GtkTreePath* _tmp11_;
-	GtkTreePath* _tmp12_;
-	SidebarEntry* _tmp13_;
-	gboolean _tmp14_;
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp1_) {
+	if (!sidebar_tree_expand_to_entry (self, entry)) {
 #line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1556 "Tree.c"
+#line 1864 "Tree.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = entry;
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp3_;
+	wrapper = _tmp0_;
 #line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = wrapper;
+	_tmp1_ = wrapper;
 #line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1574 "Tree.c"
+#line 1880 "Tree.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
+	_tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = wrapper;
+	_tmp3_ = wrapper;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
+	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = _tmp7_;
+	_tmp5_ = _tmp4_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_selection_select_path (_tmp5_, _tmp8_);
+	gtk_tree_selection_select_path (_tmp2_, _tmp5_);
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp8_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = mask_signal;
+	__vala_GtkTreePath_free0 (_tmp5_);
 #line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->mask_entry_selected_signal = _tmp9_;
+	self->priv->mask_entry_selected_signal = mask_signal;
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = wrapper;
+	_tmp6_ = wrapper;
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_);
+	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = _tmp11_;
+	_tmp8_ = _tmp7_;
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE);
+	gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, NULL, FALSE);
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp12_);
+	__vala_GtkTreePath_free0 (_tmp8_);
 #line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = FALSE;
 #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = entry;
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_);
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp14_;
+	result = sidebar_tree_scroll_to_entry (self, entry);
 #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1614 "Tree.c"
+#line 1914 "Tree.c"
 }
 
 
-gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
+gboolean
+sidebar_tree_is_selected (SidebarTree* self,
+                          SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	GtkTreeSelection* selection = NULL;
+	GtkTreeSelection* _tmp1_;
 	GtkTreeSelection* _tmp2_;
 	GtkTreeSelection* _tmp3_;
-	GtkTreeSelection* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp6_;
+	gboolean _tmp4_ = FALSE;
+	SidebarTreeEntryWrapper* _tmp5_;
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
+	_tmp1_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
 #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp2_ = _g_object_ref0 (_tmp1_);
 #line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	selection = _tmp3_;
+	selection = _tmp2_;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = selection;
+	_tmp3_ = selection;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp3_ == NULL) {
 #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1653,92 +1953,103 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 		_g_object_unref0 (wrapper);
 #line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1657 "Tree.c"
+#line 1957 "Tree.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = wrapper;
+	_tmp5_ = wrapper;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp6_ != NULL) {
-#line 1663 "Tree.c"
-		GtkTreeSelection* _tmp7_;
-		SidebarTreeEntryWrapper* _tmp8_;
+	if (_tmp5_ != NULL) {
+#line 1963 "Tree.c"
+		GtkTreeSelection* _tmp6_;
+		SidebarTreeEntryWrapper* _tmp7_;
+		GtkTreePath* _tmp8_;
 		GtkTreePath* _tmp9_;
-		GtkTreePath* _tmp10_;
-		gboolean _tmp11_;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = selection;
+		_tmp6_ = selection;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = wrapper;
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_);
+		_tmp7_ = wrapper;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = sidebar_tree_entry_wrapper_get_path (_tmp7_);
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_);
+		_tmp9_ = _tmp8_;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _tmp11_;
+		_tmp4_ = gtk_tree_selection_path_is_selected (_tmp6_, _tmp9_);
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (_tmp10_);
-#line 1683 "Tree.c"
+		__vala_GtkTreePath_free0 (_tmp9_);
+#line 1980 "Tree.c"
 	} else {
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = FALSE;
-#line 1687 "Tree.c"
+		_tmp4_ = FALSE;
+#line 1984 "Tree.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp5_;
+	result = _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1697 "Tree.c"
+#line 1994 "Tree.c"
 }
 
 
-gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
+gboolean
+sidebar_tree_is_any_selected (SidebarTree* self)
+{
 	gboolean result = FALSE;
 	GtkTreeSelection* _tmp0_;
-	gint _tmp1_;
 #line 278 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
 #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_);
-#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp1_ != 0;
+	result = gtk_tree_selection_count_selected_rows (_tmp0_) != 0;
 #line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1715 "Tree.c"
+#line 2011 "Tree.c"
 }
 
 
-static gpointer _gtk_tree_path_copy0 (gpointer self) {
+static GtkTreePath*
+_vala_GtkTreePath_copy (GtkTreePath* self)
+{
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1722 "Tree.c"
+	return g_boxed_copy (gtk_tree_path_get_type (), self);
+#line 2020 "Tree.c"
 }
 
 
-static void _gtk_tree_path_free0_ (gpointer var) {
+static gpointer
+__vala_GtkTreePath_copy0 (gpointer self)
+{
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1729 "Tree.c"
+	return self ? _vala_GtkTreePath_copy (self) : NULL;
+#line 2029 "Tree.c"
 }
 
 
-static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
+static void
+__vala_GtkTreePath_free0_ (gpointer var)
+{
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
+	(var == NULL) ? NULL : (var = (_vala_GtkTreePath_free (var), NULL));
+#line 2038 "Tree.c"
+}
+
+
+static inline void
+_g_list_free___vala_GtkTreePath_free0_ (GList* self)
+{
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_list_free (self);
-#line 1738 "Tree.c"
+	g_list_free_full (self, (GDestroyNotify) __vala_GtkTreePath_free0_);
+#line 2047 "Tree.c"
 }
 
 
-static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
+static GtkTreePath*
+sidebar_tree_get_selected_path (SidebarTree* self)
+{
 	GtkTreePath* result = NULL;
 	GtkTreeModel* model = NULL;
 	GtkTreeSelection* selection = NULL;
@@ -1752,11 +2063,9 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GtkTreeModel* _tmp6_;
 	gboolean _tmp7_ = FALSE;
 	GList* _tmp8_;
-	guint _tmp9_;
-	GtkTreePath* _tmp12_ = NULL;
-	GList* _tmp13_;
-	guint _tmp14_;
-	GtkTreePath* _tmp17_;
+	GtkTreePath* _tmp10_ = NULL;
+	GList* _tmp11_;
+	GtkTreePath* _tmp14_;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1777,7 +2086,7 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 		_g_object_unref0 (model);
 #line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1781 "Tree.c"
+#line 2090 "Tree.c"
 	}
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
@@ -1794,132 +2103,119 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = rows;
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = g_list_length (_tmp8_);
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp9_ == ((guint) 0)) {
+	if (g_list_length (_tmp8_) == ((guint) 0)) {
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1803 "Tree.c"
+#line 2110 "Tree.c"
 	} else {
-		GList* _tmp10_;
-		guint _tmp11_;
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = rows;
+		GList* _tmp9_;
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = g_list_length (_tmp10_);
+		_tmp9_ = rows;
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1813 "Tree.c"
+		_tmp7_ = g_list_length (_tmp9_) == ((guint) 1);
+#line 2117 "Tree.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = rows;
+	_tmp11_ = rows;
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = g_list_length (_tmp13_);
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp14_ != ((guint) 0)) {
-#line 1823 "Tree.c"
-		GList* _tmp15_;
-		gconstpointer _tmp16_;
+	if (g_list_length (_tmp11_) != ((guint) 0)) {
+#line 2125 "Tree.c"
+		GList* _tmp12_;
+		gconstpointer _tmp13_;
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp15_ = rows;
+		_tmp12_ = rows;
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
+		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1832 "Tree.c"
+		_tmp10_ = (GtkTreePath*) _tmp13_;
+#line 2134 "Tree.c"
 	} else {
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = NULL;
-#line 1836 "Tree.c"
+		_tmp10_ = NULL;
+#line 2138 "Tree.c"
 	}
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
+	_tmp14_ = __vala_GtkTreePath_copy0 (_tmp10_);
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp17_;
+	result = _tmp14_;
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	__g_list_free__gtk_tree_path_free0_0 (rows);
+	__g_list_free___vala_GtkTreePath_free0_0 (rows);
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
 #line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1850 "Tree.c"
+#line 2152 "Tree.c"
 }
 
 
-static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry* entry) {
+static gchar*
+sidebar_tree_get_name_for_entry (SidebarTree* self,
+                                 SidebarEntry* entry)
+{
 	gchar* result = NULL;
 	gchar* name = NULL;
-	SidebarEntry* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
 	SidebarEmphasizableEntry* emphasizable_entry = NULL;
-	SidebarEntry* _tmp5_;
+	SidebarEmphasizableEntry* _tmp4_;
+	gboolean _tmp5_ = FALSE;
 	SidebarEmphasizableEntry* _tmp6_;
-	gboolean _tmp7_ = FALSE;
-	SidebarEmphasizableEntry* _tmp8_;
 #line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_entry_get_sidebar_name (entry);
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_);
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = guarded_markup_escape_text (_tmp2_);
+	_tmp2_ = guarded_markup_escape_text (_tmp1_);
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	name = _tmp4_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = entry;
+	name = _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL);
+	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (entry, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) entry) : NULL);
 #line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	emphasizable_entry = _tmp6_;
+	emphasizable_entry = _tmp4_;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = emphasizable_entry;
+	_tmp6_ = emphasizable_entry;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp8_ != NULL) {
-#line 1895 "Tree.c"
-		SidebarEmphasizableEntry* _tmp9_;
-		gboolean _tmp10_;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = emphasizable_entry;
+	if (_tmp6_ != NULL) {
+#line 2194 "Tree.c"
+		SidebarEmphasizableEntry* _tmp7_;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
+		_tmp7_ = emphasizable_entry;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = _tmp10_;
-#line 1904 "Tree.c"
+		_tmp5_ = sidebar_emphasizable_entry_is_emphasized (_tmp7_);
+#line 2200 "Tree.c"
 	} else {
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = FALSE;
-#line 1908 "Tree.c"
+		_tmp5_ = FALSE;
+#line 2204 "Tree.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp7_) {
-#line 1912 "Tree.c"
-		const gchar* _tmp11_;
-		gchar* _tmp12_;
+	if (_tmp5_) {
+#line 2208 "Tree.c"
+		const gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = name;
+		_tmp8_ = name;
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = g_strdup_printf ("<b>%s</b>", _tmp11_);
+		_tmp9_ = g_strdup_printf ("<b>%s</b>", _tmp8_);
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		name = _tmp12_;
-#line 1923 "Tree.c"
+		name = _tmp9_;
+#line 2219 "Tree.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
@@ -1927,30 +2223,36 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	_g_object_unref0 (emphasizable_entry);
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1931 "Tree.c"
+#line 2227 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
+static gboolean
+sidebar_tree_real_accept_cursor_changed (SidebarTree* self)
+{
 	gboolean result = FALSE;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1941 "Tree.c"
+#line 2239 "Tree.c"
 }
 
 
-gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
+gboolean
+sidebar_tree_accept_cursor_changed (SidebarTree* self)
+{
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1950 "Tree.c"
+#line 2250 "Tree.c"
 }
 
 
-static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
+static void
+sidebar_tree_real_cursor_changed (GtkTreeView* base)
+{
 	SidebarTree * self;
 	GtkTreePath* path = NULL;
 	GtkTreePath* _tmp0_;
@@ -1974,13 +2276,13 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
 #line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1978 "Tree.c"
+#line 2280 "Tree.c"
 		}
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1984 "Tree.c"
+#line 2286 "Tree.c"
 	}
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
@@ -1994,7 +2296,7 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	_tmp5_ = wrapper;
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 1998 "Tree.c"
+#line 2300 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
 		SidebarTreeEntryWrapper* _tmp6_;
 		SidebarTreeEntryWrapper* _tmp7_;
@@ -2002,8 +2304,8 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
 		gint _tmp11_;
-		gboolean _tmp19_ = FALSE;
-		SidebarTreeEntryWrapper* _tmp20_;
+		gboolean _tmp18_ = FALSE;
+		SidebarTreeEntryWrapper* _tmp19_;
 #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
 #line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2018,21 +2320,21 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		_tmp11_ = self->priv->editing_disabled;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2022 "Tree.c"
+#line 2324 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp12_;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2028 "Tree.c"
+#line 2330 "Tree.c"
 		} else {
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2032 "Tree.c"
+#line 2334 "Tree.c"
 		}
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2036 "Tree.c"
+#line 2338 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp13_;
 			SidebarEntry* _tmp14_;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2041,19 +2343,18 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 			_tmp14_ = _tmp13_->entry;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2045 "Tree.c"
+#line 2347 "Tree.c"
 		} else {
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2049 "Tree.c"
+#line 2351 "Tree.c"
 		}
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2053 "Tree.c"
+#line 2355 "Tree.c"
 			GtkCellRendererText* _tmp15_;
 			SidebarTreeEntryWrapper* _tmp16_;
 			SidebarEntry* _tmp17_;
-			gboolean _tmp18_;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2061,95 +2362,91 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = _tmp16_->entry;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2068 "Tree.c"
+			g_object_set (_tmp15_, "editable", sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)), NULL);
+#line 2367 "Tree.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp20_ = wrapper;
+		_tmp19_ = wrapper;
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp20_ != NULL) {
-#line 2074 "Tree.c"
-			gboolean _tmp21_;
+		if (_tmp19_ != NULL) {
+#line 2373 "Tree.c"
+			gboolean _tmp20_;
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp21_ = self->priv->mask_entry_selected_signal;
+			_tmp20_ = self->priv->mask_entry_selected_signal;
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = !_tmp21_;
-#line 2080 "Tree.c"
+			_tmp18_ = !_tmp20_;
+#line 2379 "Tree.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = FALSE;
-#line 2084 "Tree.c"
+			_tmp18_ = FALSE;
+#line 2383 "Tree.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp19_) {
-#line 2088 "Tree.c"
+		if (_tmp18_) {
+#line 2387 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
-			SidebarTreeEntryWrapper* _tmp22_;
-			SidebarEntry* _tmp23_;
+			SidebarTreeEntryWrapper* _tmp21_;
+			SidebarEntry* _tmp22_;
+			SidebarSelectableEntry* _tmp23_;
 			SidebarSelectableEntry* _tmp24_;
-			SidebarSelectableEntry* _tmp25_;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp22_ = wrapper;
+			_tmp21_ = wrapper;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp23_ = _tmp22_->entry;
+			_tmp22_ = _tmp21_->entry;
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL);
+			_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp22_) : NULL);
 #line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			selectable = _tmp24_;
+			selectable = _tmp23_;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp25_ = selectable;
+			_tmp24_ = selectable;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp25_ != NULL) {
-#line 2106 "Tree.c"
-				gboolean _tmp26_;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
+			if (_tmp24_ != NULL) {
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				if (_tmp26_) {
-#line 2112 "Tree.c"
-					SidebarSelectableEntry* _tmp27_;
+				if (sidebar_tree_accept_cursor_changed (self)) {
+#line 2407 "Tree.c"
+					SidebarSelectableEntry* _tmp25_;
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp27_ = selectable;
+					_tmp25_ = selectable;
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_);
-#line 2118 "Tree.c"
+					g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp25_);
+#line 2413 "Tree.c"
 				} else {
-					SidebarTreeEntryWrapper* _tmp28_;
-					SidebarEntry* _tmp29_;
+					SidebarTreeEntryWrapper* _tmp26_;
+					SidebarEntry* _tmp27_;
 #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp28_ = old_wrapper;
+					_tmp26_ = old_wrapper;
 #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp29_ = _tmp28_->entry;
+					_tmp27_ = _tmp26_->entry;
 #line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2128 "Tree.c"
+					sidebar_tree_place_cursor (self, _tmp27_, TRUE);
+#line 2423 "Tree.c"
 				}
 			}
 #line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2133 "Tree.c"
+#line 2428 "Tree.c"
 		}
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2137 "Tree.c"
+#line 2432 "Tree.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2143 "Tree.c"
+#line 2438 "Tree.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
-#line 2149 "Tree.c"
+	__vala_GtkTreePath_free0 (path);
+#line 2444 "Tree.c"
 }
 
 
-void sidebar_tree_disable_editing (SidebarTree* self) {
+void
+sidebar_tree_disable_editing (SidebarTree* self)
+{
 	gint _tmp0_;
 #line 341 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
@@ -2159,18 +2456,20 @@ void sidebar_tree_disable_editing (SidebarTree* self) {
 	self->priv->editing_disabled = _tmp0_ + 1;
 #line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2163 "Tree.c"
+#line 2460 "Tree.c"
 		GtkCellRendererText* _tmp1_;
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2169 "Tree.c"
+#line 2466 "Tree.c"
 	}
 }
 
 
-void sidebar_tree_enable_editing (SidebarTree* self) {
+void
+sidebar_tree_enable_editing (SidebarTree* self)
+{
 	GtkTreePath* path = NULL;
 	GtkTreePath* _tmp0_;
 	gboolean _tmp1_ = FALSE;
@@ -2186,21 +2485,21 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	_tmp3_ = path;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2190 "Tree.c"
+#line 2489 "Tree.c"
 		gint _tmp4_;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2196 "Tree.c"
+#line 2495 "Tree.c"
 	} else {
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2200 "Tree.c"
+#line 2499 "Tree.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2204 "Tree.c"
+#line 2503 "Tree.c"
 		gint _tmp5_;
 		gint _tmp6_;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2211,15 +2510,15 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 		_tmp6_ = self->priv->editing_disabled;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2215 "Tree.c"
+#line 2514 "Tree.c"
 	} else {
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2219 "Tree.c"
+#line 2518 "Tree.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2223 "Tree.c"
+#line 2522 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
 		GtkTreePath* _tmp7_;
 		SidebarTreeEntryWrapper* _tmp8_;
@@ -2235,7 +2534,7 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 		_tmp10_ = wrapper;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2239 "Tree.c"
+#line 2538 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp11_;
 			SidebarEntry* _tmp12_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2244,19 +2543,18 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 			_tmp12_ = _tmp11_->entry;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2248 "Tree.c"
+#line 2547 "Tree.c"
 		} else {
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2252 "Tree.c"
+#line 2551 "Tree.c"
 		}
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2256 "Tree.c"
+#line 2555 "Tree.c"
 			GtkCellRendererText* _tmp13_;
 			SidebarTreeEntryWrapper* _tmp14_;
 			SidebarEntry* _tmp15_;
-			gboolean _tmp16_;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2264,24 +2562,24 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp14_->entry;
 #line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2271 "Tree.c"
+			g_object_set (_tmp13_, "editable", sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry)), NULL);
+#line 2567 "Tree.c"
 		}
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2275 "Tree.c"
+#line 2571 "Tree.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
-#line 2279 "Tree.c"
+	__vala_GtkTreePath_free0 (path);
+#line 2575 "Tree.c"
 }
 
 
-void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
-	GtkTreePath* _tmp0_;
-	gboolean _tmp1_;
+void
+sidebar_tree_toggle_branch_expansion (SidebarTree* self,
+                                      GtkTreePath* path,
+                                      gboolean expand_all)
+{
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2289,41 +2587,29 @@ void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path,
 #line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = path;
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp1_) {
-#line 2298 "Tree.c"
-		GtkTreePath* _tmp2_;
+	if (gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path)) {
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = path;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2304 "Tree.c"
+		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path);
+#line 2594 "Tree.c"
 	} else {
-		GtkTreePath* _tmp3_;
-		gboolean _tmp4_;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = path;
 #line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = expand_all;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2314 "Tree.c"
+		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path, expand_all);
+#line 2598 "Tree.c"
 	}
 }
 
 
-gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
+gboolean
+sidebar_tree_expand_to_entry (SidebarTree* self,
+                              SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
+	GtkTreePath* _tmp3_;
 	GtkTreePath* _tmp4_;
-	GtkTreePath* _tmp5_;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2331,53 +2617,53 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 #line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2350 "Tree.c"
+#line 2634 "Tree.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
+	_tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_);
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_);
+	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_);
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp5_);
+	__vala_GtkTreePath_free0 (_tmp4_);
 #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2368 "Tree.c"
+#line 2652 "Tree.c"
 }
 
 
-void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry) {
+void
+sidebar_tree_expand_to_first_child (SidebarTree* self,
+                                    SidebarEntry* entry)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-	SidebarTreeEntryWrapper* _tmp2_;
 	GtkTreePath* path = NULL;
-	SidebarTreeEntryWrapper* _tmp3_;
-	GtkTreePath* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	GtkTreePath* _tmp3_;
 	GtkTreeIter iter = {0};
-	GtkTreePath* _tmp13_;
+	GtkTreePath* _tmp11_;
 #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2385,259 +2671,221 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2402 "Tree.c"
+#line 2686 "Tree.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
+	_tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_);
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	path = _tmp4_;
+	path = _tmp3_;
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2412 "Tree.c"
-		GtkTreeStore* _tmp5_;
-		GtkTreePath* _tmp6_;
-		GtkTreeIter _tmp7_ = {0};
-		gboolean _tmp8_;
-		GtkTreeStore* _tmp9_;
-		GtkTreeIter _tmp10_;
-		gboolean _tmp11_;
-		GtkTreePath* _tmp12_;
+#line 2696 "Tree.c"
+		GtkTreeStore* _tmp4_;
+		GtkTreePath* _tmp5_;
+		GtkTreeIter _tmp6_ = {0};
+		gboolean _tmp7_;
+		GtkTreeStore* _tmp8_;
+		GtkTreeIter _tmp9_;
+		GtkTreePath* _tmp10_;
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = self->priv->store;
+		_tmp4_ = self->priv->store;
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = path;
+		_tmp5_ = path;
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_);
+		_tmp7_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp6_, _tmp5_);
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		iter = _tmp7_;
+		iter = _tmp6_;
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (!_tmp8_) {
+		if (!_tmp7_) {
 #line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2433 "Tree.c"
+#line 2716 "Tree.c"
 		}
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = self->priv->store;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = iter;
+		_tmp8_ = self->priv->store;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_);
+		_tmp9_ = iter;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (!_tmp11_) {
+		if (!gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp9_)) {
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2445 "Tree.c"
+#line 2726 "Tree.c"
 		}
 #line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = path;
+		_tmp10_ = path;
 #line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_path_down (_tmp12_);
-#line 2451 "Tree.c"
+		gtk_tree_path_down (_tmp10_);
+#line 2732 "Tree.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = path;
+	_tmp11_ = path;
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_);
+	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp11_);
 #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2461 "Tree.c"
+#line 2742 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
+static void
+_sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender,
+                                                                SidebarEntry* entry,
+                                                                gpointer self)
+{
 #line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2468 "Tree.c"
+#line 2753 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
+static void
+_sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender,
+                                                                    SidebarEntry* entry,
+                                                                    gpointer self)
+{
 #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2475 "Tree.c"
+#line 2764 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
+static void
+_sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender,
+                                                                SidebarEntry* entry,
+                                                                gpointer self)
+{
 #line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2482 "Tree.c"
+#line 2775 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
+static void
+_sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender,
+                                                                          SidebarEntry* entry,
+                                                                          SidebarEntry* old_parent,
+                                                                          gpointer self)
+{
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2489 "Tree.c"
+#line 2787 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
+static void
+_sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender,
+                                                                              SidebarEntry* entry,
+                                                                              gpointer self)
+{
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2496 "Tree.c"
+#line 2798 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
+static void
+_sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender,
+                                                         gboolean show,
+                                                         gpointer self)
+{
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2503 "Tree.c"
+#line 2809 "Tree.c"
 }
 
 
-void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position) {
-	gint _tmp0_;
+void
+sidebar_tree_graft (SidebarTree* self,
+                    SidebarBranch* branch,
+                    gint position)
+{
+	GeeHashMap* _tmp0_;
 	GeeHashMap* _tmp1_;
-	SidebarBranch* _tmp2_;
-	gboolean _tmp3_;
-	GeeHashMap* _tmp4_;
-	SidebarBranch* _tmp5_;
-	gint _tmp6_;
-	SidebarBranch* _tmp7_;
-	gboolean _tmp8_;
-	SidebarBranch* _tmp20_;
-	SidebarBranch* _tmp21_;
-	SidebarBranch* _tmp22_;
-	SidebarBranch* _tmp23_;
-	SidebarBranch* _tmp24_;
-	SidebarBranch* _tmp25_;
-	SidebarBranch* _tmp26_;
 #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
 #line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = position;
-#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_return_if_fail (_tmp0_ >= 0, "position >= 0");
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = self->priv->branches;
+	_vala_return_if_fail (position >= 0, "position >= 0");
 #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = branch;
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
+	_tmp0_ = self->priv->branches;
 #line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (!_tmp3_, "!branches.has_key(branch)");
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = self->priv->branches;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = branch;
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "!branches.has_key(branch)");
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = position;
+	_tmp1_ = self->priv->branches;
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_));
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = branch;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch, (gpointer) ((gintptr) position));
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp8_) {
-#line 2554 "Tree.c"
-		SidebarBranch* _tmp9_;
-		SidebarBranch* _tmp10_;
-		gboolean _tmp11_;
-		SidebarBranch* _tmp15_;
-		gboolean _tmp16_;
+	if (sidebar_branch_get_show_branch (branch)) {
 #line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = branch;
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_associate_branch (self, _tmp9_);
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = branch;
+		sidebar_tree_associate_branch (self, branch);
 #line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp11_) {
-#line 2570 "Tree.c"
-			SidebarBranch* _tmp12_;
-			SidebarEntry* _tmp13_;
-			SidebarEntry* _tmp14_;
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp12_ = branch;
+		if (sidebar_branch_is_startup_expand_to_first_child (branch)) {
+#line 2840 "Tree.c"
+			SidebarEntry* _tmp2_;
+			SidebarEntry* _tmp3_;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp13_ = sidebar_branch_get_root (_tmp12_);
+			_tmp2_ = sidebar_branch_get_root (branch);
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp14_ = _tmp13_;
+			_tmp3_ = _tmp2_;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_expand_to_first_child (self, _tmp14_);
+			sidebar_tree_expand_to_first_child (self, _tmp3_);
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_g_object_unref0 (_tmp14_);
-#line 2584 "Tree.c"
+			_g_object_unref0 (_tmp3_);
+#line 2851 "Tree.c"
 		}
 #line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp15_ = branch;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp16_) {
-#line 2592 "Tree.c"
-			SidebarBranch* _tmp17_;
-			SidebarEntry* _tmp18_;
-			SidebarEntry* _tmp19_;
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp17_ = branch;
+		if (sidebar_branch_is_startup_open_grouping (branch)) {
+#line 2855 "Tree.c"
+			SidebarEntry* _tmp4_;
+			SidebarEntry* _tmp5_;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = sidebar_branch_get_root (_tmp17_);
+			_tmp4_ = sidebar_branch_get_root (branch);
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = _tmp18_;
+			_tmp5_ = _tmp4_;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_expand_to_entry (self, _tmp19_);
+			sidebar_tree_expand_to_entry (self, _tmp5_);
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_g_object_unref0 (_tmp19_);
-#line 2606 "Tree.c"
+			_g_object_unref0 (_tmp5_);
+#line 2866 "Tree.c"
 		}
 	}
 #line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = branch;
-#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
-#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = branch;
+	g_signal_connect_object (branch, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
 #line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
+	g_signal_connect_object (branch, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
 #line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp22_ = branch;
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = branch;
+	g_signal_connect_object (branch, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
+	g_signal_connect_object (branch, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = branch;
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp25_ = branch;
+	g_signal_connect_object (branch, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0);
+	g_signal_connect_object (branch, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0);
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp26_ = branch;
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_);
-#line 2637 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, branch);
+#line 2883 "Tree.c"
 }
 
 
-static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
+static GtkTreeIter*
+_gtk_tree_iter_dup (GtkTreeIter* self)
+{
 	GtkTreeIter* dup;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	dup = g_new0 (GtkTreeIter, 1);
@@ -2645,52 +2893,51 @@ static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	memcpy (dup, self, sizeof (GtkTreeIter));
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2649 "Tree.c"
+#line 2897 "Tree.c"
 }
 
 
-static gpointer __gtk_tree_iter_dup0 (gpointer self) {
+static gpointer
+__gtk_tree_iter_dup0 (gpointer self)
+{
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2656 "Tree.c"
+#line 2906 "Tree.c"
 }
 
 
-static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* branch) {
+static void
+sidebar_tree_associate_branch (SidebarTree* self,
+                               SidebarBranch* branch)
+{
 	GeeHashMap* _tmp0_;
-	SidebarBranch* _tmp1_;
-	gboolean _tmp2_;
 	gint position = 0;
-	GeeHashMap* _tmp3_;
-	SidebarBranch* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp1_;
+	gpointer _tmp2_;
 	GtkTreeIter* insertion_iter = NULL;
 	GtkTreeIter iter = {0};
 	gboolean found = FALSE;
-	GtkTreeStore* _tmp6_;
-	GtkTreeIter _tmp7_ = {0};
-	gboolean _tmp8_;
-	GtkTreeIter* _tmp24_;
-	GtkTreeIter* _tmp29_;
+	GtkTreeStore* _tmp3_;
+	GtkTreeIter _tmp4_ = {0};
+	gboolean _tmp5_;
+	GtkTreeIter* _tmp21_;
+	GtkTreeIter* _tmp26_;
+	GtkTreeStore* _tmp27_;
+	SidebarEntry* _tmp28_;
+	SidebarEntry* _tmp29_;
 	GtkTreeStore* _tmp30_;
-	SidebarBranch* _tmp31_;
-	SidebarEntry* _tmp32_;
-	SidebarEntry* _tmp33_;
-	GtkTreeStore* _tmp34_;
-	GtkTreeIter* _tmp35_;
-	GtkTreeIter _tmp36_;
-	GtkTreePath* _tmp37_;
-	GtkTreePath* _tmp38_;
-	gint _tmp39_;
-	SidebarTreeRootWrapper* _tmp40_;
-	SidebarTreeRootWrapper* _tmp41_;
+	GtkTreeIter* _tmp31_;
+	GtkTreeIter _tmp32_;
+	GtkTreePath* _tmp33_;
+	GtkTreePath* _tmp34_;
+	gint _tmp35_;
+	SidebarTreeRootWrapper* _tmp36_;
+	SidebarTreeRootWrapper* _tmp37_;
+	GtkTreeIter _tmp38_;
+	SidebarEntry* _tmp39_;
+	SidebarEntry* _tmp40_;
+	GtkTreeIter* _tmp41_;
 	GtkTreeIter _tmp42_;
-	SidebarBranch* _tmp43_;
-	SidebarBranch* _tmp44_;
-	SidebarEntry* _tmp45_;
-	SidebarEntry* _tmp46_;
-	GtkTreeIter* _tmp47_;
-	GtkTreeIter _tmp48_;
 #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2698,200 +2945,191 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = branch;
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = self->priv->branches;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "branches.has_key(branch)");
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = branch;
+	_tmp1_ = self->priv->branches;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	position = (gint) ((gintptr) _tmp5_);
+	position = (gint) ((gintptr) _tmp2_);
 #line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	insertion_iter = NULL;
 #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = self->priv->store;
+	_tmp3_ = self->priv->store;
 #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
+	_tmp5_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp4_);
 #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	iter = _tmp7_;
+	iter = _tmp4_;
 #line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	found = _tmp8_;
+	found = _tmp5_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2727 "Tree.c"
-		gboolean _tmp9_;
+#line 2968 "Tree.c"
+		gboolean _tmp6_;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
-		GtkTreeIter _tmp10_;
-		SidebarTreeEntryWrapper* _tmp11_;
+		GtkTreeIter _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
+		SidebarTreeRootWrapper* _tmp9_;
+		SidebarTreeRootWrapper* _tmp10_;
+		gint _tmp11_;
 		SidebarTreeRootWrapper* _tmp12_;
-		SidebarTreeRootWrapper* _tmp13_;
-		gint _tmp14_;
-		SidebarTreeRootWrapper* _tmp15_;
-		gint _tmp16_;
-		GtkTreeStore* _tmp22_;
-		gboolean _tmp23_;
+		gint _tmp13_;
+		GtkTreeStore* _tmp19_;
+		gboolean _tmp20_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = found;
+		_tmp6_ = found;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (!_tmp9_) {
+		if (!_tmp6_) {
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2745 "Tree.c"
+#line 2986 "Tree.c"
 		}
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = iter;
+		_tmp7_ = iter;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_);
+		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL;
+		_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp8_) : NULL;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp12_ == NULL) {
+		if (_tmp9_ == NULL) {
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_g_object_unref0 (_tmp11_);
-#line 2757 "Tree.c"
+			_g_object_unref0 (_tmp8_);
+#line 2998 "Tree.c"
 		}
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		root_wrapper = _tmp12_;
+		root_wrapper = _tmp9_;
 #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = root_wrapper;
+		_tmp10_ = root_wrapper;
 #line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_vala_assert (_tmp13_ != NULL, "root_wrapper != null");
+		_vala_assert (_tmp10_ != NULL, "root_wrapper != null");
 #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = position;
+		_tmp11_ = position;
 #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp15_ = root_wrapper;
+		_tmp12_ = root_wrapper;
 #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = _tmp15_->root_position;
+		_tmp13_ = _tmp12_->root_position;
 #line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp14_ < _tmp16_) {
-#line 2773 "Tree.c"
-			GtkTreeStore* _tmp17_;
-			GtkTreeIter _tmp18_;
-			GtkTreeIter _tmp19_ = {0};
-			GtkTreeIter _tmp20_;
-			GtkTreeIter* _tmp21_;
+		if (_tmp11_ < _tmp13_) {
+#line 3014 "Tree.c"
+			GtkTreeStore* _tmp14_;
+			GtkTreeIter _tmp15_;
+			GtkTreeIter _tmp16_ = {0};
+			GtkTreeIter _tmp17_;
+			GtkTreeIter* _tmp18_;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp17_ = self->priv->store;
+			_tmp14_ = self->priv->store;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = iter;
+			_tmp15_ = iter;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_);
+			gtk_tree_store_insert_before (_tmp14_, &_tmp16_, NULL, &_tmp15_);
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_free0 (insertion_iter);
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = _tmp19_;
+			_tmp17_ = _tmp16_;
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_);
+			_tmp18_ = __gtk_tree_iter_dup0 (&_tmp17_);
 #line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			insertion_iter = _tmp21_;
+			insertion_iter = _tmp18_;
 #line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (root_wrapper);
 #line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2797 "Tree.c"
+#line 3038 "Tree.c"
 		}
 #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ = self->priv->store;
+		_tmp19_ = self->priv->store;
 #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter);
+		_tmp20_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tree_model_get_type (), GtkTreeModel), &iter);
 #line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		found = _tmp23_;
+		found = _tmp20_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2807 "Tree.c"
+#line 3048 "Tree.c"
 	}
 #line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = insertion_iter;
+	_tmp21_ = insertion_iter;
 #line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp24_ == NULL) {
-#line 2813 "Tree.c"
-		GtkTreeStore* _tmp25_;
-		GtkTreeIter _tmp26_ = {0};
-		GtkTreeIter _tmp27_;
-		GtkTreeIter* _tmp28_;
+	if (_tmp21_ == NULL) {
+#line 3054 "Tree.c"
+		GtkTreeStore* _tmp22_;
+		GtkTreeIter _tmp23_ = {0};
+		GtkTreeIter _tmp24_;
+		GtkTreeIter* _tmp25_;
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp25_ = self->priv->store;
+		_tmp22_ = self->priv->store;
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_store_append (_tmp25_, &_tmp26_, NULL);
+		gtk_tree_store_append (_tmp22_, &_tmp23_, NULL);
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (insertion_iter);
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp27_ = _tmp26_;
+		_tmp24_ = _tmp23_;
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
+		_tmp25_ = __gtk_tree_iter_dup0 (&_tmp24_);
 #line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		insertion_iter = _tmp28_;
-#line 2830 "Tree.c"
+		insertion_iter = _tmp25_;
+#line 3071 "Tree.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp29_ = insertion_iter;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp30_ = self->priv->store;
+	_tmp26_ = insertion_iter;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp31_ = branch;
+	_tmp27_ = self->priv->store;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp32_ = sidebar_branch_get_root (_tmp31_);
+	_tmp28_ = sidebar_branch_get_root (branch);
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp33_ = _tmp32_;
+	_tmp29_ = _tmp28_;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp34_ = self->priv->store;
+	_tmp30_ = self->priv->store;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp35_ = insertion_iter;
+	_tmp31_ = insertion_iter;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp36_ = *_tmp35_;
+	_tmp32_ = *_tmp31_;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_);
+	_tmp33_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp32_);
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp38_ = _tmp37_;
+	_tmp34_ = _tmp33_;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp39_ = position;
+	_tmp35_ = position;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_);
+	_tmp36_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tree_model_get_type (), GtkTreeModel), _tmp29_, _tmp34_, _tmp35_);
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp41_ = _tmp40_;
+	_tmp37_ = _tmp36_;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp42_ = *_tmp29_;
+	_tmp38_ = *_tmp26_;
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper));
+	sidebar_tree_associate_wrapper (self, &_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper));
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp41_);
+	_g_object_unref0 (_tmp37_);
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp38_);
+	__vala_GtkTreePath_free0 (_tmp34_);
 #line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp33_);
+	_g_object_unref0 (_tmp29_);
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp43_ = branch;
+	_tmp39_ = sidebar_branch_get_root (branch);
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp44_ = branch;
+	_tmp40_ = _tmp39_;
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp45_ = sidebar_branch_get_root (_tmp44_);
+	_tmp41_ = insertion_iter;
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp46_ = _tmp45_;
+	_tmp42_ = *_tmp41_;
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp47_ = insertion_iter;
+	sidebar_tree_associate_children (self, branch, _tmp40_, &_tmp42_);
 #line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp48_ = *_tmp47_;
-#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_);
-#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp46_);
+	_g_object_unref0 (_tmp40_);
 #line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 2886 "Tree.c"
+#line 3121 "Tree.c"
 }
 
 
-static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* branch, SidebarEntry* parent, GtkTreeIter* parent_iter) {
+static void
+sidebar_tree_associate_children (SidebarTree* self,
+                                 SidebarBranch* branch,
+                                 SidebarEntry* parent,
+                                 GtkTreeIter* parent_iter)
+{
 	GeeList* children = NULL;
-	SidebarBranch* _tmp0_;
-	SidebarEntry* _tmp1_;
-	GeeList* _tmp2_;
-	GeeList* _tmp3_;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -2901,135 +3139,131 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (parent_iter != NULL);
 #line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = branch;
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = parent;
+	_tmp0_ = sidebar_branch_get_children (branch, parent);
 #line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	children = _tmp2_;
+	children = _tmp0_;
 #line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = children;
+	_tmp1_ = children;
 #line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
 #line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2920 "Tree.c"
+#line 3154 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
-		GeeList* _tmp4_;
-		GeeList* _tmp5_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _child_size = 0;
-		GeeList* _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _child_index = 0;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = children;
+		_tmp2_ = children;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _g_object_ref0 (_tmp4_);
+		_tmp3_ = _g_object_ref0 (_tmp2_);
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_list = _tmp5_;
+		_child_list = _tmp3_;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = _child_list;
+		_tmp4_ = _child_list;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_size = _tmp8_;
+		_child_size = _tmp6_;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 2949 "Tree.c"
+#line 3183 "Tree.c"
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _tmp9_;
-			gint _tmp10_;
-			gint _tmp11_;
 			SidebarEntry* child = NULL;
-			GeeList* _tmp12_;
-			gint _tmp13_;
-			gpointer _tmp14_;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			GtkTreeIter append_iter = {0};
-			GtkTreeStore* _tmp15_;
+			GtkTreeStore* _tmp13_;
+			GtkTreeIter _tmp14_;
+			GtkTreeIter _tmp15_ = {0};
 			GtkTreeIter _tmp16_;
-			GtkTreeIter _tmp17_ = {0};
-			GtkTreeIter _tmp18_;
-			SidebarEntry* _tmp19_;
-			SidebarBranch* _tmp20_;
-			SidebarEntry* _tmp21_;
-			GtkTreeIter _tmp22_;
+			SidebarEntry* _tmp17_;
+			SidebarEntry* _tmp18_;
+			GtkTreeIter _tmp19_;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp9_ = _child_index;
+			_tmp7_ = _child_index;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_child_index = _tmp9_ + 1;
+			_child_index = _tmp7_ + 1;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp10_ = _child_index;
+			_tmp8_ = _child_index;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp11_ = _child_size;
+			_tmp9_ = _child_size;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (!(_tmp10_ < _tmp11_)) {
+			if (!(_tmp8_ < _tmp9_)) {
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 2978 "Tree.c"
+#line 3211 "Tree.c"
 			}
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp12_ = _child_list;
+			_tmp10_ = _child_list;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp13_ = _child_index;
+			_tmp11_ = _child_index;
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
+			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			child = (SidebarEntry*) _tmp14_;
+			child = (SidebarEntry*) _tmp12_;
 #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp15_ = self->priv->store;
+			_tmp13_ = self->priv->store;
 #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp16_ = *parent_iter;
+			_tmp14_ = *parent_iter;
 #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_);
+			gtk_tree_store_append (_tmp13_, &_tmp15_, &_tmp14_);
 #line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			append_iter = _tmp17_;
+			append_iter = _tmp15_;
 #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = append_iter;
+			_tmp16_ = append_iter;
 #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = child;
+			_tmp17_ = child;
 #line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_);
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = branch;
+			sidebar_tree_associate_entry (self, &_tmp16_, _tmp17_);
 #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp21_ = child;
+			_tmp18_ = child;
 #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp22_ = append_iter;
+			_tmp19_ = append_iter;
 #line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
+			sidebar_tree_associate_children (self, branch, _tmp18_, &_tmp19_);
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3012 "Tree.c"
+#line 3243 "Tree.c"
 		}
 #line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3016 "Tree.c"
+#line 3247 "Tree.c"
 	}
 #line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3020 "Tree.c"
+#line 3251 "Tree.c"
 }
 
 
-static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarEntry* entry) {
+static void
+sidebar_tree_associate_entry (SidebarTree* self,
+                              GtkTreeIter* assoc_iter,
+                              SidebarEntry* entry)
+{
 	GtkTreeIter _tmp0_;
 	GtkTreeStore* _tmp1_;
-	SidebarEntry* _tmp2_;
-	GtkTreeStore* _tmp3_;
-	GtkTreeIter _tmp4_;
+	GtkTreeStore* _tmp2_;
+	GtkTreeIter _tmp3_;
+	GtkTreePath* _tmp4_;
 	GtkTreePath* _tmp5_;
-	GtkTreePath* _tmp6_;
+	SidebarTreeEntryWrapper* _tmp6_;
 	SidebarTreeEntryWrapper* _tmp7_;
-	SidebarTreeEntryWrapper* _tmp8_;
 #line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3041,113 +3275,135 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = entry;
-#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = self->priv->store;
+	_tmp2_ = self->priv->store;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = *assoc_iter;
+	_tmp3_ = *assoc_iter;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_);
+	_tmp4_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_);
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_);
+	_tmp6_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), entry, _tmp5_);
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_);
+	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp7_);
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp6_);
-#line 3064 "Tree.c"
+	__vala_GtkTreePath_free0 (_tmp5_);
+#line 3296 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
+static void
+_sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender,
+                                                                                const gchar* tooltip,
+                                                                                gpointer self)
+{
 #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3071 "Tree.c"
+#line 3307 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
+static void
+_sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender,
+                                                                          const gchar* icon,
+                                                                          gpointer self)
+{
 #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3078 "Tree.c"
+#line 3318 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
+static void
+_sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender,
+                                                                                Page* page,
+                                                                                gpointer self)
+{
 #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3085 "Tree.c"
+#line 3329 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
+static void
+_sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender,
+                                                                                      Page* page,
+                                                                                      gpointer self)
+{
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3092 "Tree.c"
+#line 3340 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
+static void
+_sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender,
+                                                                                         gboolean emphasized,
+                                                                                         gpointer self)
+{
 #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3099 "Tree.c"
+#line 3351 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
+static void
+_sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender,
+                                                                                     const gchar* name,
+                                                                                     gpointer self)
+{
 #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3106 "Tree.c"
+#line 3362 "Tree.c"
 }
 
 
-static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* assoc_iter, SidebarTreeEntryWrapper* wrapper) {
+static void
+sidebar_tree_associate_wrapper (SidebarTree* self,
+                                GtkTreeIter* assoc_iter,
+                                SidebarTreeEntryWrapper* wrapper)
+{
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarEntry* _tmp0_;
 	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
-	GeeHashMap* _tmp6_;
-	SidebarEntry* _tmp7_;
-	SidebarTreeEntryWrapper* _tmp8_;
-	GtkTreeStore* _tmp9_;
-	GtkTreeIter _tmp10_;
-	SidebarEntry* _tmp11_;
-	gchar* _tmp12_;
-	gchar* _tmp13_;
-	GtkTreeStore* _tmp14_;
-	GtkTreeIter _tmp15_;
-	SidebarEntry* _tmp16_;
+	GeeHashMap* _tmp2_;
+	SidebarEntry* _tmp3_;
+	GeeHashMap* _tmp4_;
+	SidebarEntry* _tmp5_;
+	GtkTreeStore* _tmp6_;
+	GtkTreeIter _tmp7_;
+	SidebarEntry* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	GtkTreeStore* _tmp11_;
+	GtkTreeIter _tmp12_;
+	SidebarEntry* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
 	gchar* _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
-	gchar* _tmp20_;
-	GtkTreeStore* _tmp21_;
-	GtkTreeIter _tmp22_;
-	SidebarTreeEntryWrapper* _tmp23_;
-	GtkTreeIter _tmp24_;
-	SidebarEntry* _tmp25_;
-	SidebarEntry* _tmp26_;
+	GtkTreeStore* _tmp18_;
+	GtkTreeIter _tmp19_;
+	GtkTreeIter _tmp20_;
+	SidebarEntry* _tmp21_;
+	SidebarEntry* _tmp22_;
 	SidebarPageRepresentative* pageable = NULL;
-	SidebarEntry* _tmp27_;
-	SidebarPageRepresentative* _tmp28_;
-	SidebarPageRepresentative* _tmp29_;
+	SidebarEntry* _tmp23_;
+	SidebarPageRepresentative* _tmp24_;
+	SidebarPageRepresentative* _tmp25_;
 	SidebarEmphasizableEntry* emphasizable = NULL;
-	SidebarEntry* _tmp32_;
-	SidebarEmphasizableEntry* _tmp33_;
-	SidebarEmphasizableEntry* _tmp34_;
+	SidebarEntry* _tmp28_;
+	SidebarEmphasizableEntry* _tmp29_;
+	SidebarEmphasizableEntry* _tmp30_;
 	SidebarRenameableEntry* renameable = NULL;
+	SidebarEntry* _tmp32_;
+	SidebarRenameableEntry* _tmp33_;
+	SidebarRenameableEntry* _tmp34_;
 	SidebarEntry* _tmp36_;
-	SidebarRenameableEntry* _tmp37_;
-	SidebarRenameableEntry* _tmp38_;
-	SidebarEntry* _tmp40_;
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3155,146 +3411,138 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = wrapper;
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->entry;
+	_tmp0_ = wrapper->entry;
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	entry = _tmp2_;
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = self->priv->entry_map;
+	entry = _tmp1_;
 #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->entry_map;
 #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = entry;
 #line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (!_tmp5_, "!entry_map.has_key(entry)");
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_), "!entry_map.has_key(entry)");
 #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = self->priv->entry_map;
+	_tmp4_ = self->priv->entry_map;
 #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = entry;
-#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = wrapper;
+	_tmp5_ = entry;
 #line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, wrapper);
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = self->priv->store;
+	_tmp6_ = self->priv->store;
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = *assoc_iter;
+	_tmp7_ = *assoc_iter;
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = entry;
+	_tmp8_ = entry;
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_);
+	_tmp9_ = sidebar_tree_get_name_for_entry (self, _tmp8_);
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = _tmp12_;
+	_tmp10_ = _tmp9_;
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1);
+	gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_NAME, _tmp10_, -1);
 #line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp10_);
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = self->priv->store;
+	_tmp11_ = self->priv->store;
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = *assoc_iter;
+	_tmp12_ = *assoc_iter;
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = entry;
+	_tmp13_ = entry;
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_);
+	_tmp14_ = sidebar_entry_get_sidebar_tooltip (_tmp13_);
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = _tmp17_;
+	_tmp15_ = _tmp14_;
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = guarded_markup_escape_text (_tmp18_);
+	_tmp16_ = guarded_markup_escape_text (_tmp15_);
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = _tmp19_;
+	_tmp17_ = _tmp16_;
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1);
+	gtk_tree_store_set (_tmp11_, &_tmp12_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp17_, -1);
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp17_);
 #line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp18_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = self->priv->store;
+	_g_free0 (_tmp15_);
 #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp22_ = *assoc_iter;
+	_tmp18_ = self->priv->store;
 #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = wrapper;
+	_tmp19_ = *assoc_iter;
 #line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1);
+	gtk_tree_store_set (_tmp18_, &_tmp19_, SIDEBAR_TREE_COLUMNS_WRAPPER, wrapper, -1);
 #line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = *assoc_iter;
+	_tmp20_ = *assoc_iter;
 #line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_load_entry_icons (self, &_tmp24_);
+	sidebar_tree_load_entry_icons (self, &_tmp20_);
 #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp25_ = entry;
+	_tmp21_ = entry;
 #line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
+	g_signal_connect_object (_tmp21_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
 #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp26_ = entry;
+	_tmp22_ = entry;
 #line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0);
+	g_signal_connect_object (_tmp22_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0);
 #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp27_ = entry;
+	_tmp23_ = entry;
 #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL);
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp23_) : NULL);
 #line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	pageable = _tmp28_;
+	pageable = _tmp24_;
 #line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp29_ = pageable;
+	_tmp25_ = pageable;
 #line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp29_ != NULL) {
-#line 3246 "Tree.c"
-		SidebarPageRepresentative* _tmp30_;
-		SidebarPageRepresentative* _tmp31_;
+	if (_tmp25_ != NULL) {
+#line 3494 "Tree.c"
+		SidebarPageRepresentative* _tmp26_;
+		SidebarPageRepresentative* _tmp27_;
 #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp30_ = pageable;
+		_tmp26_ = pageable;
 #line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
+		g_signal_connect_object (_tmp26_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp31_ = pageable;
+		_tmp27_ = pageable;
 #line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3257 "Tree.c"
+		g_signal_connect_object (_tmp27_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
+#line 3505 "Tree.c"
 	}
 #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp32_ = entry;
+	_tmp28_ = entry;
 #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL);
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp28_) : NULL);
 #line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	emphasizable = _tmp33_;
+	emphasizable = _tmp29_;
 #line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp34_ = emphasizable;
+	_tmp30_ = emphasizable;
 #line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp34_ != NULL) {
-#line 3269 "Tree.c"
-		SidebarEmphasizableEntry* _tmp35_;
+	if (_tmp30_ != NULL) {
+#line 3517 "Tree.c"
+		SidebarEmphasizableEntry* _tmp31_;
 #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp35_ = emphasizable;
+		_tmp31_ = emphasizable;
 #line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3275 "Tree.c"
+		g_signal_connect_object (_tmp31_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
+#line 3523 "Tree.c"
 	}
 #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp36_ = entry;
+	_tmp32_ = entry;
 #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL);
+	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp32_) : NULL);
 #line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	renameable = _tmp37_;
+	renameable = _tmp33_;
 #line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp38_ = renameable;
+	_tmp34_ = renameable;
 #line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp38_ != NULL) {
-#line 3287 "Tree.c"
-		SidebarRenameableEntry* _tmp39_;
+	if (_tmp34_ != NULL) {
+#line 3535 "Tree.c"
+		SidebarRenameableEntry* _tmp35_;
 #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp39_ = renameable;
+		_tmp35_ = renameable;
 #line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3293 "Tree.c"
+		g_signal_connect_object (_tmp35_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
+#line 3541 "Tree.c"
 	}
 #line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp40_ = entry;
+	_tmp36_ = entry;
 #line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_entry_grafted (_tmp40_, self);
+	sidebar_entry_grafted (_tmp36_, self);
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3303,41 +3551,44 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	_g_object_unref0 (pageable);
 #line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3307 "Tree.c"
+#line 3555 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self, GtkTreeIter* new_iter, SidebarTreeEntryWrapper* current_wrapper) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_reparent_wrapper (SidebarTree* self,
+                               GtkTreeIter* new_iter,
+                               SidebarTreeEntryWrapper* current_wrapper)
+{
 	SidebarTreeEntryWrapper* result = NULL;
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp0_;
+	SidebarEntry* _tmp0_;
 	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp3_;
-	gboolean _tmp4_;
+	GeeHashMap* _tmp2_;
+	gboolean _tmp3_;
 	SidebarTreeEntryWrapper* new_wrapper = NULL;
+	GtkTreeStore* _tmp4_;
 	GtkTreeStore* _tmp5_;
-	GtkTreeStore* _tmp6_;
-	GtkTreeIter _tmp7_;
+	GtkTreeIter _tmp6_;
+	GtkTreePath* _tmp7_;
 	GtkTreePath* _tmp8_;
-	GtkTreePath* _tmp9_;
+	SidebarTreeEntryWrapper* _tmp9_;
 	SidebarTreeEntryWrapper* _tmp10_;
-	SidebarTreeEntryWrapper* _tmp11_;
-	GeeHashMap* _tmp12_;
-	GtkTreeStore* _tmp13_;
-	GtkTreeIter _tmp14_;
+	GeeHashMap* _tmp11_;
+	GtkTreeStore* _tmp12_;
+	GtkTreeIter _tmp13_;
+	gchar* _tmp14_;
 	gchar* _tmp15_;
-	gchar* _tmp16_;
-	GtkTreeStore* _tmp17_;
-	GtkTreeIter _tmp18_;
+	GtkTreeStore* _tmp16_;
+	GtkTreeIter _tmp17_;
+	gchar* _tmp18_;
 	gchar* _tmp19_;
 	gchar* _tmp20_;
 	gchar* _tmp21_;
-	gchar* _tmp22_;
-	GtkTreeStore* _tmp23_;
+	GtkTreeStore* _tmp22_;
+	GtkTreeIter _tmp23_;
 	GtkTreeIter _tmp24_;
-	GtkTreeIter _tmp25_;
 #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3345,119 +3596,108 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 #line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL);
 #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = current_wrapper;
-#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->entry;
+	_tmp0_ = current_wrapper->entry;
 #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = self->priv->entry_map;
+	_tmp2_ = self->priv->entry_map;
 #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
+	_tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
 #line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	removed = _tmp4_;
+	removed = _tmp3_;
 #line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = self->priv->store;
+	_tmp4_ = self->priv->store;
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = self->priv->store;
+	_tmp5_ = self->priv->store;
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = *new_iter;
+	_tmp6_ = *new_iter;
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
+	_tmp7_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp6_);
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_);
+	_tmp9_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tree_model_get_type (), GtkTreeModel), entry, _tmp8_);
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp9_);
+	__vala_GtkTreePath_free0 (_tmp8_);
 #line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_wrapper = _tmp11_;
+	new_wrapper = _tmp10_;
 #line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = self->priv->entry_map;
+	_tmp11_ = self->priv->entry_map;
 #line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper);
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = self->priv->store;
+	_tmp12_ = self->priv->store;
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = *new_iter;
+	_tmp13_ = *new_iter;
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = sidebar_tree_get_name_for_entry (self, entry);
+	_tmp14_ = sidebar_tree_get_name_for_entry (self, entry);
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1);
+	gtk_tree_store_set (_tmp12_, &_tmp13_, SIDEBAR_TREE_COLUMNS_NAME, _tmp15_, -1);
 #line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp16_);
+	_g_free0 (_tmp15_);
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = self->priv->store;
+	_tmp16_ = self->priv->store;
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = *new_iter;
+	_tmp17_ = *new_iter;
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = sidebar_entry_get_sidebar_tooltip (entry);
+	_tmp18_ = sidebar_entry_get_sidebar_tooltip (entry);
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = guarded_markup_escape_text (_tmp20_);
+	_tmp20_ = guarded_markup_escape_text (_tmp19_);
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp22_ = _tmp21_;
+	_tmp21_ = _tmp20_;
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1);
+	gtk_tree_store_set (_tmp16_, &_tmp17_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp21_, -1);
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp22_);
+	_g_free0 (_tmp21_);
 #line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp19_);
 #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = self->priv->store;
+	_tmp22_ = self->priv->store;
 #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = *new_iter;
+	_tmp23_ = *new_iter;
 #line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
+	gtk_tree_store_set (_tmp22_, &_tmp23_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
 #line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp25_ = *new_iter;
+	_tmp24_ = *new_iter;
 #line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_load_entry_icons (self, &_tmp25_);
+	sidebar_tree_load_entry_icons (self, &_tmp24_);
 #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = new_wrapper;
 #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
 #line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3432 "Tree.c"
+#line 3681 "Tree.c"
 }
 
 
-void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
+void
+sidebar_tree_prune (SidebarTree* self,
+                    SidebarBranch* branch)
+{
 	GeeHashMap* _tmp0_;
-	SidebarBranch* _tmp1_;
-	gboolean _tmp2_;
-	SidebarBranch* _tmp3_;
-	SidebarEntry* _tmp4_;
-	SidebarEntry* _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-	SidebarBranch* _tmp9_;
-	guint _tmp10_;
-	SidebarBranch* _tmp11_;
-	guint _tmp12_;
-	SidebarBranch* _tmp13_;
-	guint _tmp14_;
-	SidebarBranch* _tmp15_;
-	guint _tmp16_;
-	SidebarBranch* _tmp17_;
-	guint _tmp18_;
-	SidebarBranch* _tmp19_;
-	guint _tmp20_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	gboolean _tmp3_;
+	guint _tmp4_;
+	guint _tmp5_;
+	guint _tmp6_;
+	guint _tmp7_;
+	guint _tmp8_;
+	guint _tmp9_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp21_;
-	SidebarBranch* _tmp22_;
-	gboolean _tmp23_;
-	SidebarBranch* _tmp24_;
+	GeeHashMap* _tmp10_;
+	gboolean _tmp11_;
 #line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3465,234 +3705,194 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
 #line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = branch;
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = branch;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch), "branches.has_key(branch)");
 #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_branch_get_root (_tmp3_);
+	_tmp1_ = sidebar_branch_get_root (branch);
 #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_);
+	_tmp2_ = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = sidebar_tree_has_wrapper (self, _tmp2_);
 #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp2_);
 #line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp7_) {
-#line 3488 "Tree.c"
-		SidebarBranch* _tmp8_;
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = branch;
+	if (_tmp3_) {
 #line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3494 "Tree.c"
+		sidebar_tree_disassociate_branch (self, branch);
+#line 3722 "Tree.c"
 	}
 #line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = branch;
+	g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp4_, NULL, FALSE);
 #line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE);
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self);
-#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = branch;
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self);
 #line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE);
+	g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp5_, NULL, FALSE);
 #line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self);
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self);
 #line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = branch;
+	g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp6_, NULL, FALSE);
 #line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE);
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self);
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = branch;
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self);
 #line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE);
+	g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp7_, NULL, FALSE);
 #line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self);
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self);
 #line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = branch;
+	g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp8_, NULL, FALSE);
 #line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self);
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = branch;
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self);
 #line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE);
+	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp9_, NULL, FALSE);
 #line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self);
+	g_signal_handlers_disconnect_matched (branch, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self);
 #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = self->priv->branches;
+	_tmp10_ = self->priv->branches;
 #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp22_ = branch;
+	_tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), branch, NULL);
 #line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL);
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	removed = _tmp23_;
+	removed = _tmp11_;
 #line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
 #line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = branch;
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_);
-#line 3546 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, branch);
+#line 3758 "Tree.c"
 }
 
 
-static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch* branch) {
+static void
+sidebar_tree_disassociate_branch (SidebarTree* self,
+                                  SidebarBranch* branch)
+{
 	SidebarTreeRootWrapper* root_wrapper = NULL;
-	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp0_;
 	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarTreeRootWrapper* _tmp3_;
 	SidebarTreeRootWrapper* _tmp4_;
-	SidebarTreeRootWrapper* _tmp5_;
 #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = branch;
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_branch_get_root (_tmp0_);
+	_tmp0_ = sidebar_branch_get_root (branch);
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
+	_tmp2_ = sidebar_tree_get_wrapper (self, _tmp1_);
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp2_) : NULL;
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp3_ == NULL) {
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_object_unref0 (_tmp3_);
-#line 3576 "Tree.c"
+		_g_object_unref0 (_tmp2_);
+#line 3788 "Tree.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	root_wrapper = _tmp5_;
+	root_wrapper = _tmp4_;
 #line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (root_wrapper != NULL, "root_wrapper != null");
 #line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
 #line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3590 "Tree.c"
+#line 3802 "Tree.c"
 }
 
 
-static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
+static void
+sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self,
+                                              SidebarTreeEntryWrapper* wrapper,
+                                              gboolean only_children)
+{
 	gboolean selected = FALSE;
-	SidebarTreeEntryWrapper* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
+	SidebarEntry* _tmp0_;
+	gboolean _tmp1_;
 #line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
 #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = wrapper;
+	_tmp0_ = wrapper->entry;
 #line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->entry;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = sidebar_tree_is_selected (self, _tmp1_);
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	selected = _tmp2_;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	selected = sidebar_tree_is_selected (self, _tmp0_);
 #line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = only_children;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_);
+	sidebar_tree_disassociate_wrapper (self, wrapper, only_children);
 #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = selected;
+	_tmp1_ = selected;
 #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp5_) {
-#line 3624 "Tree.c"
+	if (_tmp1_) {
+#line 3828 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
-		SidebarTreeEntryWrapper* _tmp6_;
-		SidebarEntry* _tmp7_;
-		SidebarSelectableEntry* _tmp8_;
-		SidebarSelectableEntry* _tmp9_;
-		SidebarSelectableEntry* _tmp10_;
-#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = wrapper;
+		SidebarEntry* _tmp2_;
+		SidebarSelectableEntry* _tmp3_;
+		SidebarSelectableEntry* _tmp4_;
+		SidebarSelectableEntry* _tmp5_;
 #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = _tmp6_->entry;
+		_tmp2_ = wrapper->entry;
 #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL);
+		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp2_) : NULL);
 #line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		selectable = _tmp8_;
+		selectable = _tmp3_;
 #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = selectable;
+		_tmp4_ = selectable;
 #line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_vala_assert (_tmp9_ != NULL, "selectable != null");
+		_vala_assert (_tmp4_ != NULL, "selectable != null");
 #line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = selectable;
+		_tmp5_ = selectable;
 #line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp10_);
+		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp5_);
 #line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3649 "Tree.c"
+#line 3850 "Tree.c"
 	}
 }
 
 
-static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEntryWrapper* wrapper, gboolean only_children) {
+static void
+sidebar_tree_disassociate_wrapper (SidebarTree* self,
+                                   SidebarTreeEntryWrapper* wrapper,
+                                   gboolean only_children)
+{
 	GeeArrayList* children = NULL;
 	GeeArrayList* _tmp0_;
 	GtkTreeIter child_iter = {0};
 	gboolean found = FALSE;
 	GtkTreeStore* _tmp1_;
-	SidebarTreeEntryWrapper* _tmp2_;
+	GtkTreeIter _tmp2_ = {0};
 	GtkTreeIter _tmp3_ = {0};
-	GtkTreeIter _tmp4_ = {0};
-	gboolean _tmp5_;
-	gboolean _tmp26_;
+	gboolean _tmp4_;
 	GtkTreeIter iter = {0};
+	GtkTreeIter _tmp25_ = {0};
+	GtkTreeStore* _tmp26_;
 	SidebarTreeEntryWrapper* _tmp27_;
-	GtkTreeIter _tmp28_ = {0};
-	GtkTreeStore* _tmp29_;
-	SidebarTreeEntryWrapper* _tmp30_;
-	SidebarTreeEntryWrapper* _tmp31_;
 	SidebarEntry* entry = NULL;
-	SidebarTreeEntryWrapper* _tmp32_;
+	SidebarEntry* _tmp28_;
+	SidebarEntry* _tmp29_;
+	SidebarEntry* _tmp30_;
+	SidebarEntry* _tmp31_;
+	guint _tmp32_;
 	SidebarEntry* _tmp33_;
-	SidebarEntry* _tmp34_;
-	SidebarEntry* _tmp35_;
-	SidebarEntry* _tmp36_;
-	guint _tmp37_;
-	SidebarEntry* _tmp38_;
-	guint _tmp39_;
+	guint _tmp34_;
 	SidebarPageRepresentative* pageable = NULL;
-	SidebarEntry* _tmp40_;
-	SidebarPageRepresentative* _tmp41_;
-	SidebarPageRepresentative* _tmp42_;
+	SidebarEntry* _tmp35_;
+	SidebarPageRepresentative* _tmp36_;
+	SidebarPageRepresentative* _tmp37_;
 	SidebarRenameableEntry* renameable = NULL;
-	SidebarEntry* _tmp47_;
-	SidebarRenameableEntry* _tmp48_;
-	SidebarRenameableEntry* _tmp49_;
+	SidebarEntry* _tmp42_;
+	SidebarRenameableEntry* _tmp43_;
+	SidebarRenameableEntry* _tmp44_;
 	SidebarEmphasizableEntry* emphasizable = NULL;
-	SidebarEntry* _tmp52_;
-	SidebarEmphasizableEntry* _tmp53_;
-	SidebarEmphasizableEntry* _tmp54_;
+	SidebarEntry* _tmp47_;
+	SidebarEmphasizableEntry* _tmp48_;
+	SidebarEmphasizableEntry* _tmp49_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp57_;
-	SidebarEntry* _tmp58_;
-	gboolean _tmp59_;
-	gboolean _tmp60_;
+	GeeHashMap* _tmp52_;
+	SidebarEntry* _tmp53_;
+	gboolean _tmp54_;
+	gboolean _tmp55_;
 #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3704,268 +3904,258 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
 #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
-#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_);
+	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_);
 #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_);
+	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_, &_tmp2_);
 #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	child_iter = _tmp4_;
+	child_iter = _tmp3_;
 #line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	found = _tmp5_;
+	found = _tmp4_;
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3719 "Tree.c"
-		gboolean _tmp6_;
+#line 3917 "Tree.c"
+		gboolean _tmp5_;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
-		GtkTreeIter _tmp7_;
+		GtkTreeIter _tmp6_;
+		SidebarTreeEntryWrapper* _tmp7_;
 		SidebarTreeEntryWrapper* _tmp8_;
-		SidebarTreeEntryWrapper* _tmp9_;
-		GeeArrayList* _tmp10_;
-		SidebarTreeEntryWrapper* _tmp11_;
-		GtkTreeStore* _tmp12_;
-		gboolean _tmp13_;
+		GeeArrayList* _tmp9_;
+		SidebarTreeEntryWrapper* _tmp10_;
+		GtkTreeStore* _tmp11_;
+		gboolean _tmp12_;
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = found;
+		_tmp5_ = found;
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (!_tmp6_) {
+		if (!_tmp5_) {
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3735 "Tree.c"
+#line 3933 "Tree.c"
 		}
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = child_iter;
+		_tmp6_ = child_iter;
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
+		_tmp7_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp6_);
 #line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		child_wrapper = _tmp8_;
+		child_wrapper = _tmp7_;
 #line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = child_wrapper;
+		_tmp8_ = child_wrapper;
 #line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_vala_assert (_tmp9_ != NULL, "child_wrapper != null");
+		_vala_assert (_tmp8_ != NULL, "child_wrapper != null");
 #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = children;
+		_tmp9_ = children;
 #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = child_wrapper;
+		_tmp10_ = child_wrapper;
 #line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
 #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = self->priv->store;
+		_tmp11_ = self->priv->store;
 #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
+		_tmp12_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_tree_model_get_type (), GtkTreeModel), &child_iter);
 #line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		found = _tmp13_;
+		found = _tmp12_;
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3761 "Tree.c"
+#line 3959 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
+		GeeArrayList* _tmp13_;
 		GeeArrayList* _tmp14_;
-		GeeArrayList* _tmp15_;
 		gint _child_wrapper_size = 0;
-		GeeArrayList* _tmp16_;
+		GeeArrayList* _tmp15_;
+		gint _tmp16_;
 		gint _tmp17_;
-		gint _tmp18_;
 		gint _child_wrapper_index = 0;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = children;
+		_tmp13_ = children;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp15_ = _g_object_ref0 (_tmp14_);
+		_tmp14_ = _g_object_ref0 (_tmp13_);
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_wrapper_list = _tmp15_;
+		_child_wrapper_list = _tmp14_;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = _child_wrapper_list;
+		_tmp15_ = _child_wrapper_list;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp18_ = _tmp17_;
+		_tmp17_ = _tmp16_;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_wrapper_size = _tmp18_;
+		_child_wrapper_size = _tmp17_;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_index = -1;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3790 "Tree.c"
+#line 3988 "Tree.c"
+			gint _tmp18_;
 			gint _tmp19_;
 			gint _tmp20_;
-			gint _tmp21_;
 			SidebarTreeEntryWrapper* child_wrapper = NULL;
-			GeeArrayList* _tmp22_;
-			gint _tmp23_;
-			gpointer _tmp24_;
-			SidebarTreeEntryWrapper* _tmp25_;
+			GeeArrayList* _tmp21_;
+			gint _tmp22_;
+			gpointer _tmp23_;
+			SidebarTreeEntryWrapper* _tmp24_;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = _child_wrapper_index;
+			_tmp18_ = _child_wrapper_index;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_child_wrapper_index = _tmp19_ + 1;
+			_child_wrapper_index = _tmp18_ + 1;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = _child_wrapper_index;
+			_tmp19_ = _child_wrapper_index;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp21_ = _child_wrapper_size;
+			_tmp20_ = _child_wrapper_size;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (!(_tmp20_ < _tmp21_)) {
+			if (!(_tmp19_ < _tmp20_)) {
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3811 "Tree.c"
+#line 4009 "Tree.c"
 			}
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp22_ = _child_wrapper_list;
+			_tmp21_ = _child_wrapper_list;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp23_ = _child_wrapper_index;
+			_tmp22_ = _child_wrapper_index;
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
+			_tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_);
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_;
+			child_wrapper = (SidebarTreeEntryWrapper*) _tmp23_;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp25_ = child_wrapper;
+			_tmp24_ = child_wrapper;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
+			sidebar_tree_disassociate_wrapper (self, _tmp24_, FALSE);
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 3827 "Tree.c"
+#line 4025 "Tree.c"
 		}
 #line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3831 "Tree.c"
+#line 4029 "Tree.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp26_ = only_children;
-#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp26_) {
+	if (only_children) {
 #line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
 #line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3841 "Tree.c"
+#line 4037 "Tree.c"
 	}
 #line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp27_ = wrapper;
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_);
+	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp25_);
 #line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	iter = _tmp28_;
+	iter = _tmp25_;
 #line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp29_ = self->priv->store;
+	_tmp26_ = self->priv->store;
 #line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_remove (_tmp29_, &iter);
+	gtk_tree_store_remove (_tmp26_, &iter);
 #line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp30_ = self->priv->selected_wrapper;
+	_tmp27_ = self->priv->selected_wrapper;
 #line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp31_ = wrapper;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp30_ == _tmp31_) {
+	if (_tmp27_ == wrapper) {
 #line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3861 "Tree.c"
+#line 4053 "Tree.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp32_ = wrapper;
+	_tmp28_ = wrapper->entry;
 #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp33_ = _tmp32_->entry;
+	_tmp29_ = _g_object_ref0 (_tmp28_);
 #line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	entry = _tmp34_;
+	entry = _tmp29_;
 #line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp35_ = entry;
+	_tmp30_ = entry;
 #line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_entry_pruned (_tmp35_, self);
+	sidebar_entry_pruned (_tmp30_, self);
 #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp36_ = entry;
+	_tmp31_ = entry;
 #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE);
+	g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp32_, NULL, FALSE);
 #line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self);
+	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self);
 #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp38_ = entry;
+	_tmp33_ = entry;
 #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE);
+	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp34_, NULL, FALSE);
 #line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self);
+	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self);
 #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp40_ = entry;
+	_tmp35_ = entry;
 #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL);
+	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp35_) : NULL);
 #line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	pageable = _tmp41_;
+	pageable = _tmp36_;
 #line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp42_ = pageable;
+	_tmp37_ = pageable;
 #line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp42_ != NULL) {
-#line 3897 "Tree.c"
-		SidebarPageRepresentative* _tmp43_;
-		guint _tmp44_;
-		SidebarPageRepresentative* _tmp45_;
-		guint _tmp46_;
+	if (_tmp37_ != NULL) {
+#line 4087 "Tree.c"
+		SidebarPageRepresentative* _tmp38_;
+		guint _tmp39_;
+		SidebarPageRepresentative* _tmp40_;
+		guint _tmp41_;
 #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp43_ = pageable;
+		_tmp38_ = pageable;
 #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE);
+		g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp39_, NULL, FALSE);
 #line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self);
+		g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self);
 #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp45_ = pageable;
+		_tmp40_ = pageable;
 #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
+		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp41_, NULL, FALSE);
 #line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 3914 "Tree.c"
+		g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
+#line 4104 "Tree.c"
 	}
 #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp47_ = entry;
+	_tmp42_ = entry;
 #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL);
+	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp42_) : NULL);
 #line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	renameable = _tmp48_;
+	renameable = _tmp43_;
 #line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp49_ = renameable;
+	_tmp44_ = renameable;
 #line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp49_ != NULL) {
-#line 3926 "Tree.c"
-		SidebarRenameableEntry* _tmp50_;
-		guint _tmp51_;
+	if (_tmp44_ != NULL) {
+#line 4116 "Tree.c"
+		SidebarRenameableEntry* _tmp45_;
+		guint _tmp46_;
 #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp50_ = renameable;
+		_tmp45_ = renameable;
 #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
+		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp46_, NULL, FALSE);
 #line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 3935 "Tree.c"
+		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
+#line 4125 "Tree.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp52_ = entry;
+	_tmp47_ = entry;
 #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL);
+	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp47_) : NULL);
 #line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	emphasizable = _tmp53_;
+	emphasizable = _tmp48_;
 #line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp54_ = emphasizable;
+	_tmp49_ = emphasizable;
 #line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp54_ != NULL) {
-#line 3947 "Tree.c"
-		SidebarEmphasizableEntry* _tmp55_;
-		guint _tmp56_;
+	if (_tmp49_ != NULL) {
+#line 4137 "Tree.c"
+		SidebarEmphasizableEntry* _tmp50_;
+		guint _tmp51_;
 #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp55_ = emphasizable;
+		_tmp50_ = emphasizable;
 #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
+		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp51_, NULL, FALSE);
 #line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 3956 "Tree.c"
+		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
+#line 4146 "Tree.c"
 	}
 #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp57_ = self->priv->entry_map;
+	_tmp52_ = self->priv->entry_map;
 #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp58_ = entry;
+	_tmp53_ = entry;
 #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL);
+	_tmp54_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp53_, NULL);
 #line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	removed = _tmp59_;
+	removed = _tmp54_;
 #line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp60_ = removed;
+	_tmp55_ = removed;
 #line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp60_, "removed");
+	_vala_assert (_tmp55_, "removed");
 #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
 #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3976,33 +4166,28 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	_g_object_unref0 (entry);
 #line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3980 "Tree.c"
+#line 4170 "Tree.c"
 }
 
 
-static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
+static void
+sidebar_tree_on_branch_entry_added (SidebarTree* self,
+                                    SidebarBranch* branch,
+                                    SidebarEntry* entry)
+{
 	SidebarEntry* parent = NULL;
-	SidebarBranch* _tmp0_;
+	SidebarEntry* _tmp0_;
 	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
-	SidebarEntry* _tmp3_;
 	SidebarTreeEntryWrapper* parent_wrapper = NULL;
-	SidebarEntry* _tmp4_;
-	SidebarTreeEntryWrapper* _tmp5_;
-	SidebarTreeEntryWrapper* _tmp6_;
+	SidebarEntry* _tmp2_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp4_;
 	GtkTreeIter insertion_iter = {0};
 	SidebarEntry* next = NULL;
-	SidebarBranch* _tmp7_;
-	SidebarEntry* _tmp8_;
-	SidebarEntry* _tmp9_;
-	SidebarEntry* _tmp10_;
-	GtkTreeIter _tmp23_;
-	SidebarEntry* _tmp24_;
-	SidebarBranch* _tmp25_;
-	SidebarEntry* _tmp26_;
-	GtkTreeIter _tmp27_;
-	SidebarBranch* _tmp28_;
-	gboolean _tmp29_;
+	SidebarEntry* _tmp5_;
+	SidebarEntry* _tmp6_;
+	GtkTreeIter _tmp19_;
+	GtkTreeIter _tmp20_;
 #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4010,116 +4195,94 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = branch;
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = entry;
+	_tmp0_ = sidebar_branch_get_parent (branch, entry);
 #line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_);
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	parent = _tmp2_;
+	parent = _tmp0_;
 #line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = parent;
+	_tmp1_ = parent;
 #line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp3_ != NULL, "parent != null");
+	_vala_assert (_tmp1_ != NULL, "parent != null");
 #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = parent;
+	_tmp2_ = parent;
 #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_);
+	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
 #line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	parent_wrapper = _tmp5_;
+	parent_wrapper = _tmp3_;
 #line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = parent_wrapper;
+	_tmp4_ = parent_wrapper;
 #line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp6_ != NULL, "parent_wrapper != null");
-#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = branch;
+	_vala_assert (_tmp4_ != NULL, "parent_wrapper != null");
 #line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = entry;
+	_tmp5_ = sidebar_branch_get_next_sibling (branch, entry);
 #line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_);
-#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	next = _tmp9_;
+	next = _tmp5_;
 #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = next;
+	_tmp6_ = next;
 #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp10_ != NULL) {
-#line 4047 "Tree.c"
+	if (_tmp6_ != NULL) {
+#line 4224 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
-		SidebarEntry* _tmp11_;
+		SidebarEntry* _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
+		GtkTreeStore* _tmp9_;
+		SidebarTreeEntryWrapper* _tmp10_;
+		GtkTreeIter _tmp11_ = {0};
 		SidebarTreeEntryWrapper* _tmp12_;
-		GtkTreeStore* _tmp13_;
-		SidebarTreeEntryWrapper* _tmp14_;
-		GtkTreeIter _tmp15_ = {0};
-		SidebarTreeEntryWrapper* _tmp16_;
-		GtkTreeIter _tmp17_ = {0};
-		GtkTreeIter _tmp18_ = {0};
+		GtkTreeIter _tmp13_ = {0};
+		GtkTreeIter _tmp14_ = {0};
 #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = next;
+		_tmp7_ = next;
 #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_);
+		_tmp8_ = sidebar_tree_get_wrapper (self, _tmp7_);
 #line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		next_wrapper = _tmp12_;
+		next_wrapper = _tmp8_;
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = self->priv->store;
+		_tmp9_ = self->priv->store;
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = parent_wrapper;
+		_tmp10_ = parent_wrapper;
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
+		sidebar_tree_entry_wrapper_get_iter (_tmp10_, &_tmp11_);
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = next_wrapper;
+		_tmp12_ = next_wrapper;
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
+		sidebar_tree_entry_wrapper_get_iter (_tmp12_, &_tmp13_);
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_);
+		gtk_tree_store_insert_before (_tmp9_, &_tmp14_, &_tmp11_, &_tmp13_);
 #line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		insertion_iter = _tmp18_;
+		insertion_iter = _tmp14_;
 #line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4079 "Tree.c"
+#line 4256 "Tree.c"
 	} else {
-		GtkTreeStore* _tmp19_;
-		SidebarTreeEntryWrapper* _tmp20_;
-		GtkTreeIter _tmp21_ = {0};
-		GtkTreeIter _tmp22_ = {0};
+		GtkTreeStore* _tmp15_;
+		SidebarTreeEntryWrapper* _tmp16_;
+		GtkTreeIter _tmp17_ = {0};
+		GtkTreeIter _tmp18_ = {0};
 #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp19_ = self->priv->store;
+		_tmp15_ = self->priv->store;
 #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp20_ = parent_wrapper;
+		_tmp16_ = parent_wrapper;
 #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_);
+		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
 #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
+		gtk_tree_store_append (_tmp15_, &_tmp18_, &_tmp17_);
 #line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		insertion_iter = _tmp22_;
-#line 4095 "Tree.c"
+		insertion_iter = _tmp18_;
+#line 4272 "Tree.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = insertion_iter;
+	_tmp19_ = insertion_iter;
 #line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = entry;
-#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_);
-#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp25_ = branch;
+	sidebar_tree_associate_entry (self, &_tmp19_, entry);
 #line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp26_ = entry;
+	_tmp20_ = insertion_iter;
 #line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp27_ = insertion_iter;
-#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp28_ = branch;
+	sidebar_tree_associate_children (self, branch, entry, &_tmp20_);
 #line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp29_) {
-#line 4117 "Tree.c"
-		SidebarEntry* _tmp30_;
-#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp30_ = entry;
+	if (sidebar_branch_is_auto_open_on_new_child (branch)) {
 #line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4123 "Tree.c"
+		sidebar_tree_expand_to_entry (self, entry);
+#line 4286 "Tree.c"
 	}
 #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
@@ -4127,14 +4290,17 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	_g_object_unref0 (parent_wrapper);
 #line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4131 "Tree.c"
+#line 4294 "Tree.c"
 }
 
 
-static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
+static void
+sidebar_tree_on_branch_entry_removed (SidebarTree* self,
+                                      SidebarBranch* branch,
+                                      SidebarEntry* entry)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarTreeEntryWrapper* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp0_;
 #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4142,11 +4308,9 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
 #line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4155,27 +4319,28 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
 #line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4159 "Tree.c"
+#line 4323 "Tree.c"
 }
 
 
-static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
+static void
+sidebar_tree_on_branch_entry_moved (SidebarTree* self,
+                                    SidebarBranch* branch,
+                                    SidebarEntry* entry)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
 	GtkTreeIter* prev_iter = NULL;
 	SidebarEntry* prev = NULL;
-	SidebarBranch* _tmp4_;
-	SidebarEntry* _tmp5_;
-	SidebarEntry* _tmp6_;
-	SidebarEntry* _tmp7_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
 	GtkTreeIter entry_iter = {0};
-	SidebarTreeEntryWrapper* _tmp14_;
-	GtkTreeIter _tmp15_ = {0};
-	GtkTreeStore* _tmp16_;
-	GtkTreeIter* _tmp17_;
+	SidebarTreeEntryWrapper* _tmp11_;
+	GtkTreeIter _tmp12_ = {0};
+	GtkTreeStore* _tmp13_;
+	GtkTreeIter* _tmp14_;
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4183,131 +4348,124 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp2_ != NULL, "wrapper != null");
+	_vala_assert (_tmp1_ != NULL, "wrapper != null");
 #line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
+	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
 #line 654 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
 #line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = branch;
-#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = entry;
+	_tmp3_ = sidebar_branch_get_previous_sibling (branch, entry);
 #line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_);
-#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	prev = _tmp6_;
+	prev = _tmp3_;
 #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = prev;
+	_tmp4_ = prev;
 #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp7_ != NULL) {
-#line 4214 "Tree.c"
+	if (_tmp4_ != NULL) {
+#line 4373 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
-		SidebarEntry* _tmp8_;
-		SidebarTreeEntryWrapper* _tmp9_;
-		SidebarTreeEntryWrapper* _tmp10_;
-		SidebarTreeEntryWrapper* _tmp11_;
-		GtkTreeIter _tmp12_ = {0};
-		GtkTreeIter* _tmp13_;
+		SidebarEntry* _tmp5_;
+		SidebarTreeEntryWrapper* _tmp6_;
+		SidebarTreeEntryWrapper* _tmp7_;
+		SidebarTreeEntryWrapper* _tmp8_;
+		GtkTreeIter _tmp9_ = {0};
+		GtkTreeIter* _tmp10_;
 #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = prev;
+		_tmp5_ = prev;
 #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_);
+		_tmp6_ = sidebar_tree_get_wrapper (self, _tmp5_);
 #line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		prev_wrapper = _tmp9_;
+		prev_wrapper = _tmp6_;
 #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = prev_wrapper;
+		_tmp7_ = prev_wrapper;
 #line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_vala_assert (_tmp10_ != NULL, "prev_wrapper != null");
+		_vala_assert (_tmp7_ != NULL, "prev_wrapper != null");
 #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = prev_wrapper;
+		_tmp8_ = prev_wrapper;
 #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
+		sidebar_tree_entry_wrapper_get_iter (_tmp8_, &_tmp9_);
 #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_);
+		_tmp10_ = __gtk_tree_iter_dup0 (&_tmp9_);
 #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
 #line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		prev_iter = _tmp13_;
+		prev_iter = _tmp10_;
 #line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4244 "Tree.c"
+#line 4403 "Tree.c"
 	}
 #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = wrapper;
+	_tmp11_ = wrapper;
 #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
+	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
 #line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	entry_iter = _tmp15_;
+	entry_iter = _tmp12_;
 #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = self->priv->store;
+	_tmp13_ = self->priv->store;
 #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = prev_iter;
+	_tmp14_ = prev_iter;
 #line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_);
+	gtk_tree_store_move_after (_tmp13_, &entry_iter, _tmp14_);
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
 #line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4264 "Tree.c"
+#line 4423 "Tree.c"
 }
 
 
-static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry, SidebarEntry* old_parent) {
+static void
+sidebar_tree_on_branch_entry_reparented (SidebarTree* self,
+                                         SidebarBranch* branch,
+                                         SidebarEntry* entry,
+                                         SidebarEntry* old_parent)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
 	gboolean selected = FALSE;
+	GtkTreePath* _tmp3_;
 	GtkTreePath* _tmp4_;
-	GtkTreePath* _tmp5_;
-	SidebarTreeEntryWrapper* _tmp6_;
+	SidebarTreeEntryWrapper* _tmp5_;
+	GtkTreePath* _tmp6_;
 	GtkTreePath* _tmp7_;
-	GtkTreePath* _tmp8_;
-	gint _tmp9_;
-	gboolean _tmp10_;
+	gboolean _tmp8_;
 	GtkTreeIter iter = {0};
-	SidebarTreeEntryWrapper* _tmp11_;
-	GtkTreeIter _tmp12_ = {0};
-	GtkTreeStore* _tmp13_;
+	SidebarTreeEntryWrapper* _tmp9_;
+	GtkTreeIter _tmp10_ = {0};
+	GtkTreeStore* _tmp11_;
 	SidebarEntry* parent = NULL;
-	SidebarBranch* _tmp14_;
-	SidebarEntry* _tmp15_;
-	SidebarEntry* _tmp16_;
-	SidebarEntry* _tmp17_;
+	SidebarEntry* _tmp12_;
+	SidebarEntry* _tmp13_;
 	SidebarTreeEntryWrapper* parent_wrapper = NULL;
-	SidebarEntry* _tmp18_;
-	SidebarTreeEntryWrapper* _tmp19_;
-	SidebarTreeEntryWrapper* _tmp20_;
+	SidebarEntry* _tmp14_;
+	SidebarTreeEntryWrapper* _tmp15_;
+	SidebarTreeEntryWrapper* _tmp16_;
 	GtkTreeIter* prev_iter = NULL;
 	SidebarEntry* prev = NULL;
-	SidebarBranch* _tmp21_;
-	SidebarEntry* _tmp22_;
-	SidebarEntry* _tmp23_;
-	SidebarEntry* _tmp24_;
+	SidebarEntry* _tmp17_;
+	SidebarEntry* _tmp18_;
 	GtkTreeIter new_iter = {0};
-	GtkTreeStore* _tmp31_;
-	SidebarTreeEntryWrapper* _tmp32_;
-	GtkTreeIter _tmp33_ = {0};
-	GtkTreeIter* _tmp34_;
-	GtkTreeIter _tmp35_ = {0};
+	GtkTreeStore* _tmp25_;
+	SidebarTreeEntryWrapper* _tmp26_;
+	GtkTreeIter _tmp27_ = {0};
+	GtkTreeIter* _tmp28_;
+	GtkTreeIter _tmp29_ = {0};
 	SidebarTreeEntryWrapper* new_wrapper = NULL;
-	GtkTreeIter _tmp36_;
-	SidebarTreeEntryWrapper* _tmp37_;
-	SidebarTreeEntryWrapper* _tmp38_;
-	gboolean _tmp39_;
+	GtkTreeIter _tmp30_;
+	SidebarTreeEntryWrapper* _tmp31_;
+	SidebarTreeEntryWrapper* _tmp32_;
+	gboolean _tmp33_;
 #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4317,159 +4475,147 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent));
 #line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp2_ != NULL, "wrapper != null");
+	_vala_assert (_tmp1_ != NULL, "wrapper != null");
 #line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
+	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_get_current_path (self);
+	_tmp3_ = sidebar_tree_get_current_path (self);
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = wrapper;
+	_tmp5_ = wrapper;
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
+	_tmp6_ = sidebar_tree_entry_wrapper_get_path (_tmp5_);
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = _tmp7_;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_);
+	_tmp7_ = _tmp6_;
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = _tmp9_ == 0;
+	_tmp8_ = gtk_tree_path_compare (_tmp4_, _tmp7_) == 0;
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp8_);
+	__vala_GtkTreePath_free0 (_tmp7_);
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp5_);
+	__vala_GtkTreePath_free0 (_tmp4_);
 #line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	selected = _tmp10_;
+	selected = _tmp8_;
 #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = wrapper;
+	_tmp9_ = wrapper;
 #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
+	sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_);
 #line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	iter = _tmp12_;
+	iter = _tmp10_;
 #line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = self->priv->store;
+	_tmp11_ = self->priv->store;
 #line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_remove (_tmp13_, &iter);
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = branch;
+	gtk_tree_store_remove (_tmp11_, &iter);
 #line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = entry;
+	_tmp12_ = sidebar_branch_get_parent (branch, entry);
 #line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_);
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	parent = _tmp16_;
+	parent = _tmp12_;
 #line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = parent;
+	_tmp13_ = parent;
 #line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp17_ != NULL, "parent != null");
+	_vala_assert (_tmp13_ != NULL, "parent != null");
 #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = parent;
+	_tmp14_ = parent;
 #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_);
+	_tmp15_ = sidebar_tree_get_wrapper (self, _tmp14_);
 #line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	parent_wrapper = _tmp19_;
+	parent_wrapper = _tmp15_;
 #line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = parent_wrapper;
+	_tmp16_ = parent_wrapper;
 #line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp20_ != NULL, "parent_wrapper != null");
+	_vala_assert (_tmp16_ != NULL, "parent_wrapper != null");
 #line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
 #line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = branch;
-#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp22_ = entry;
+	_tmp17_ = sidebar_branch_get_previous_sibling (branch, entry);
 #line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_);
-#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	prev = _tmp23_;
+	prev = _tmp17_;
 #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = prev;
+	_tmp18_ = prev;
 #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp24_ != NULL) {
-#line 4400 "Tree.c"
+	if (_tmp18_ != NULL) {
+#line 4546 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
-		SidebarEntry* _tmp25_;
-		SidebarTreeEntryWrapper* _tmp26_;
-		SidebarTreeEntryWrapper* _tmp27_;
-		SidebarTreeEntryWrapper* _tmp28_;
-		GtkTreeIter _tmp29_ = {0};
-		GtkTreeIter* _tmp30_;
+		SidebarEntry* _tmp19_;
+		SidebarTreeEntryWrapper* _tmp20_;
+		SidebarTreeEntryWrapper* _tmp21_;
+		SidebarTreeEntryWrapper* _tmp22_;
+		GtkTreeIter _tmp23_ = {0};
+		GtkTreeIter* _tmp24_;
 #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp25_ = prev;
+		_tmp19_ = prev;
 #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_);
+		_tmp20_ = sidebar_tree_get_wrapper (self, _tmp19_);
 #line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		prev_wrapper = _tmp26_;
+		prev_wrapper = _tmp20_;
 #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp27_ = prev_wrapper;
+		_tmp21_ = prev_wrapper;
 #line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_vala_assert (_tmp27_ != NULL, "prev_wrapper != null");
+		_vala_assert (_tmp21_ != NULL, "prev_wrapper != null");
 #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp28_ = prev_wrapper;
+		_tmp22_ = prev_wrapper;
 #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_);
+		sidebar_tree_entry_wrapper_get_iter (_tmp22_, &_tmp23_);
 #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_);
+		_tmp24_ = __gtk_tree_iter_dup0 (&_tmp23_);
 #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
 #line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		prev_iter = _tmp30_;
+		prev_iter = _tmp24_;
 #line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4430 "Tree.c"
+#line 4576 "Tree.c"
 	}
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp31_ = self->priv->store;
+	_tmp25_ = self->priv->store;
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp32_ = parent_wrapper;
+	_tmp26_ = parent_wrapper;
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_);
+	sidebar_tree_entry_wrapper_get_iter (_tmp26_, &_tmp27_);
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp34_ = prev_iter;
+	_tmp28_ = prev_iter;
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_);
+	gtk_tree_store_insert_after (_tmp25_, &_tmp29_, &_tmp27_, _tmp28_);
 #line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_iter = _tmp35_;
+	new_iter = _tmp29_;
 #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp36_ = new_iter;
+	_tmp30_ = new_iter;
 #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp37_ = wrapper;
+	_tmp31_ = wrapper;
 #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_);
+	_tmp32_ = sidebar_tree_reparent_wrapper (self, &_tmp30_, _tmp31_);
 #line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_wrapper = _tmp38_;
+	new_wrapper = _tmp32_;
 #line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp39_ = selected;
+	_tmp33_ = selected;
 #line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp39_) {
-#line 4456 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp40_;
-		SidebarEntry* _tmp41_;
-		SidebarTreeEntryWrapper* _tmp42_;
-		SidebarEntry* _tmp43_;
+	if (_tmp33_) {
+#line 4602 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp34_;
+		SidebarEntry* _tmp35_;
+		SidebarTreeEntryWrapper* _tmp36_;
+		SidebarEntry* _tmp37_;
 #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp40_ = new_wrapper;
+		_tmp34_ = new_wrapper;
 #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp41_ = _tmp40_->entry;
+		_tmp35_ = _tmp34_->entry;
 #line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_expand_to_entry (self, _tmp41_);
+		sidebar_tree_expand_to_entry (self, _tmp35_);
 #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp42_ = new_wrapper;
+		_tmp36_ = new_wrapper;
 #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp43_ = _tmp42_->entry;
+		_tmp37_ = _tmp36_->entry;
 #line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4473 "Tree.c"
+		sidebar_tree_place_cursor (self, _tmp37_, FALSE);
+#line 4619 "Tree.c"
 	}
 #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
@@ -4483,16 +4629,18 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	_g_object_unref0 (parent);
 #line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4487 "Tree.c"
+#line 4633 "Tree.c"
 }
 
 
-static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, SidebarBranch* branch, SidebarEntry* entry) {
+static void
+sidebar_tree_on_branch_children_reordered (SidebarTree* self,
+                                           SidebarBranch* branch,
+                                           SidebarEntry* entry)
+{
 	GeeList* children = NULL;
-	SidebarBranch* _tmp0_;
-	SidebarEntry* _tmp1_;
-	GeeList* _tmp2_;
-	GeeList* _tmp3_;
+	GeeList* _tmp0_;
+	GeeList* _tmp1_;
 #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4500,263 +4648,240 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = branch;
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = entry;
+	_tmp0_ = sidebar_branch_get_children (branch, entry);
 #line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	children = _tmp2_;
+	children = _tmp0_;
 #line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = children;
+	_tmp1_ = children;
 #line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
 #line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4519 "Tree.c"
+#line 4663 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
-		GeeList* _tmp4_;
-		GeeList* _tmp5_;
+		GeeList* _tmp2_;
+		GeeList* _tmp3_;
 		gint _child_size = 0;
-		GeeList* _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
+		GeeList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _child_index = 0;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = children;
+		_tmp2_ = children;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _g_object_ref0 (_tmp4_);
+		_tmp3_ = _g_object_ref0 (_tmp2_);
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_list = _tmp5_;
+		_child_list = _tmp3_;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = _child_list;
+		_tmp4_ = _child_list;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_child_size = _tmp8_;
+		_child_size = _tmp6_;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4548 "Tree.c"
+#line 4692 "Tree.c"
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _tmp9_;
-			gint _tmp10_;
-			gint _tmp11_;
 			SidebarEntry* child = NULL;
-			GeeList* _tmp12_;
-			gint _tmp13_;
-			gpointer _tmp14_;
+			GeeList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			SidebarTreeEntryWrapper* child_wrapper = NULL;
-			SidebarEntry* _tmp15_;
-			SidebarTreeEntryWrapper* _tmp16_;
-			SidebarTreeEntryWrapper* _tmp17_;
+			SidebarEntry* _tmp13_;
+			SidebarTreeEntryWrapper* _tmp14_;
+			SidebarTreeEntryWrapper* _tmp15_;
 			GtkTreeIter child_iter = {0};
-			SidebarTreeEntryWrapper* _tmp18_;
-			GtkTreeIter _tmp19_ = {0};
-			GtkTreeStore* _tmp20_;
+			SidebarTreeEntryWrapper* _tmp16_;
+			GtkTreeIter _tmp17_ = {0};
+			GtkTreeStore* _tmp18_;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp9_ = _child_index;
+			_tmp7_ = _child_index;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_child_index = _tmp9_ + 1;
+			_child_index = _tmp7_ + 1;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp10_ = _child_index;
+			_tmp8_ = _child_index;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp11_ = _child_size;
+			_tmp9_ = _child_size;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (!(_tmp10_ < _tmp11_)) {
+			if (!(_tmp8_ < _tmp9_)) {
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4576 "Tree.c"
+#line 4720 "Tree.c"
 			}
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp12_ = _child_list;
+			_tmp10_ = _child_list;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp13_ = _child_index;
+			_tmp11_ = _child_index;
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
+			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			child = (SidebarEntry*) _tmp14_;
+			child = (SidebarEntry*) _tmp12_;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp15_ = child;
+			_tmp13_ = child;
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_);
+			_tmp14_ = sidebar_tree_get_wrapper (self, _tmp13_);
 #line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			child_wrapper = _tmp16_;
+			child_wrapper = _tmp14_;
 #line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp17_ = child_wrapper;
+			_tmp15_ = child_wrapper;
 #line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_vala_assert (_tmp17_ != NULL, "child_wrapper != null");
+			_vala_assert (_tmp15_ != NULL, "child_wrapper != null");
 #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = child_wrapper;
+			_tmp16_ = child_wrapper;
 #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_);
+			sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
 #line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			child_iter = _tmp19_;
+			child_iter = _tmp17_;
 #line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = self->priv->store;
+			_tmp18_ = self->priv->store;
 #line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			gtk_tree_store_move_before (_tmp20_, &child_iter, NULL);
+			gtk_tree_store_move_before (_tmp18_, &child_iter, NULL);
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4610 "Tree.c"
+#line 4754 "Tree.c"
 		}
 #line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4614 "Tree.c"
+#line 4758 "Tree.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4618 "Tree.c"
+#line 4762 "Tree.c"
 }
 
 
-static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branch, gboolean shown) {
-	gboolean _tmp0_;
-	SidebarBranch* _tmp3_;
-	gboolean _tmp4_;
+static void
+sidebar_tree_on_show_branch (SidebarTree* self,
+                             SidebarBranch* branch,
+                             gboolean shown)
+{
 #line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
 #line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = shown;
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp0_) {
-#line 4634 "Tree.c"
-		SidebarBranch* _tmp1_;
+	if (shown) {
 #line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp1_ = branch;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4640 "Tree.c"
+		sidebar_tree_associate_branch (self, branch);
+#line 4779 "Tree.c"
 	} else {
-		SidebarBranch* _tmp2_;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = branch;
 #line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4647 "Tree.c"
+		sidebar_tree_disassociate_branch (self, branch);
+#line 4783 "Tree.c"
 	}
 #line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = branch;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = shown;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_);
-#line 4655 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, branch, shown);
+#line 4787 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip) {
+static void
+sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self,
+                                         SidebarEntry* entry,
+                                         const gchar* tooltip)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarTreeEntryWrapper* _tmp1_;
-	GtkTreeStore* _tmp2_;
-	GtkTreeIter _tmp3_ = {0};
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	SidebarTreeEntryWrapper* _tmp0_;
+	GtkTreeStore* _tmp1_;
+	GtkTreeIter _tmp2_ = {0};
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = self->priv->store;
-#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
+	_tmp1_ = self->priv->store;
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = tooltip;
+	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_);
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = guarded_markup_escape_text (_tmp4_);
+	_tmp3_ = guarded_markup_escape_text (tooltip);
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = _tmp3_;
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1);
+	gtk_tree_store_set (_tmp1_, &_tmp2_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp4_, -1);
 #line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp4_);
 #line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4696 "Tree.c"
+#line 4826 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name) {
+static void
+sidebar_tree_on_sidebar_icon_changed (SidebarTree* self,
+                                      SidebarEntry* entry,
+                                      const gchar* icon_name)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-	SidebarTreeEntryWrapper* _tmp2_;
 	GIcon* icon = NULL;
-	GtkTreeStore* _tmp8_;
-	SidebarTreeEntryWrapper* _tmp9_;
-	GtkTreeIter _tmp10_ = {0};
-	GIcon* _tmp11_;
+	GtkTreeStore* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
+	GtkTreeIter _tmp7_ = {0};
+	GIcon* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (_tmp2_ != NULL, "wrapper != null");
+	_vala_assert (_tmp1_ != NULL, "wrapper != null");
 #line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	icon = NULL;
-#line 4727 "Tree.c"
+#line 4858 "Tree.c"
 	{
-		const gchar* _tmp3_;
 #line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = icon_name;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp3_ != NULL) {
-#line 4734 "Tree.c"
-			GIcon* _tmp4_ = NULL;
-			const gchar* _tmp5_;
-			GIcon* _tmp6_;
-			GIcon* _tmp7_;
-#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp5_ = icon_name;
+		if (icon_name != NULL) {
+#line 4862 "Tree.c"
+			GIcon* _tmp2_ = NULL;
+			GIcon* _tmp3_;
+			GIcon* _tmp4_;
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp6_ = g_icon_new_for_string (_tmp5_, &_inner_error_);
+			_tmp3_ = g_icon_new_for_string (icon_name, &_inner_error_);
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp4_ = _tmp6_;
+			_tmp2_ = _tmp3_;
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4747 "Tree.c"
+#line 4872 "Tree.c"
 				goto __catch56_g_error;
 			}
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp7_ = _tmp4_;
+			_tmp4_ = _tmp2_;
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp4_ = NULL;
+			_tmp2_ = NULL;
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (icon);
 #line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			icon = _tmp7_;
+			icon = _tmp4_;
 #line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_g_object_unref0 (_tmp4_);
-#line 4760 "Tree.c"
+			_g_object_unref0 (_tmp2_);
+#line 4885 "Tree.c"
 		}
 	}
 	goto __finally56;
@@ -4769,7 +4894,7 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 		_inner_error_ = NULL;
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (e);
-#line 4773 "Tree.c"
+#line 4898 "Tree.c"
 	}
 	__finally56:
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4784,69 +4909,69 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 		g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4788 "Tree.c"
+#line 4913 "Tree.c"
 	}
 #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = self->priv->store;
+	_tmp5_ = self->priv->store;
 #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = wrapper;
+	_tmp6_ = wrapper;
 #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_);
+	sidebar_tree_entry_wrapper_get_iter (_tmp6_, &_tmp7_);
 #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = icon;
+	_tmp8_ = icon;
 #line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp8_, &_tmp10_, SIDEBAR_TREE_COLUMNS_ICON, _tmp11_, -1);
+	gtk_tree_store_set (_tmp5_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1);
 #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (icon);
 #line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4804 "Tree.c"
+#line 4929 "Tree.c"
 }
 
 
-static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
+static void
+sidebar_tree_rename_entry (SidebarTree* self,
+                           SidebarEntry* entry)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarTreeEntryWrapper* _tmp1_;
-	GtkTreeStore* _tmp2_;
-	GtkTreeIter _tmp3_ = {0};
-	SidebarEntry* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	SidebarTreeEntryWrapper* _tmp0_;
+	GtkTreeStore* _tmp1_;
+	GtkTreeIter _tmp2_ = {0};
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = self->priv->store;
-#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
+	_tmp1_ = self->priv->store;
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = entry;
+	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp2_);
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_);
+	_tmp3_ = sidebar_tree_get_name_for_entry (self, entry);
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = _tmp3_;
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1);
+	gtk_tree_store_set (_tmp1_, &_tmp2_, SIDEBAR_TREE_COLUMNS_NAME, _tmp4_, -1);
 #line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp4_);
 #line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4845 "Tree.c"
+#line 4967 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
-	SidebarEntry* _tmp0_;
+static void
+sidebar_tree_on_sidebar_name_changed (SidebarTree* self,
+                                      SidebarEntry* entry,
+                                      const gchar* name)
+{
 #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4854,16 +4979,16 @@ static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntr
 #line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (name != NULL);
 #line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4861 "Tree.c"
+	sidebar_tree_rename_entry (self, entry);
+#line 4984 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
-	SidebarPageRepresentative* _tmp0_;
-	Page* _tmp1_;
+static void
+sidebar_tree_on_sidebar_page_created (SidebarTree* self,
+                                      SidebarPageRepresentative* entry,
+                                      Page* page)
+{
 #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4871,32 +4996,31 @@ static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPage
 #line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = page;
-#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4880 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, entry, page);
+#line 5001 "Tree.c"
 }
 
 
-static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
-	SidebarEmphasizableEntry* _tmp0_;
+static void
+sidebar_tree_on_is_emphasized_changed (SidebarTree* self,
+                                       SidebarEmphasizableEntry* entry,
+                                       gboolean is_emphasized)
+{
 #line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry));
 #line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4894 "Tree.c"
+	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 5016 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
-	SidebarPageRepresentative* _tmp0_;
-	Page* _tmp1_;
+static void
+sidebar_tree_on_sidebar_destroying_page (SidebarTree* self,
+                                         SidebarPageRepresentative* entry,
+                                         Page* page)
+{
 #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4904,16 +5028,15 @@ static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarP
 #line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = page;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4913 "Tree.c"
+	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, entry, page);
+#line 5033 "Tree.c"
 }
 
 
-static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter) {
+static void
+sidebar_tree_load_entry_icons (SidebarTree* self,
+                               GtkTreeIter* iter)
+{
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GtkTreeIter _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
@@ -4945,7 +5068,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 		_g_object_unref0 (wrapper);
 #line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4949 "Tree.c"
+#line 5072 "Tree.c"
 	}
 	{
 		gchar* name = NULL;
@@ -4965,7 +5088,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 		_tmp6_ = name;
 #line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ != NULL) {
-#line 4969 "Tree.c"
+#line 5092 "Tree.c"
 			GIcon* _tmp7_ = NULL;
 			const gchar* _tmp8_;
 			GIcon* _tmp9_;
@@ -4980,7 +5103,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_free0 (name);
-#line 4984 "Tree.c"
+#line 5107 "Tree.c"
 				goto __catch57_g_error;
 			}
 #line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -4993,11 +5116,11 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 			icon = _tmp10_;
 #line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp7_);
-#line 4997 "Tree.c"
+#line 5120 "Tree.c"
 		}
 #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
-#line 5001 "Tree.c"
+#line 5124 "Tree.c"
 	}
 	goto __finally57;
 	__catch57_g_error:
@@ -5009,7 +5132,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 		_inner_error_ = NULL;
 #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (e);
-#line 5013 "Tree.c"
+#line 5136 "Tree.c"
 	}
 	__finally57:
 #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5024,7 +5147,7 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 		g_clear_error (&_inner_error_);
 #line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 5028 "Tree.c"
+#line 5151 "Tree.c"
 	}
 #line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = self->priv->store;
@@ -5038,11 +5161,14 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	_g_object_unref0 (icon);
 #line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 5042 "Tree.c"
+#line 5165 "Tree.c"
 }
 
 
-static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter) {
+static void
+sidebar_tree_load_branch_icons (SidebarTree* self,
+                                GtkTreeIter* iter)
+{
 	GtkTreeIter _tmp0_;
 	GtkTreeIter child_iter = {0};
 	GtkTreeStore* _tmp1_;
@@ -5062,34 +5188,34 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = *iter;
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_);
+	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp3_, &_tmp2_);
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp3_;
 #line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5071 "Tree.c"
+#line 5197 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
 #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
 #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 5078 "Tree.c"
+#line 5204 "Tree.c"
 				GtkTreeIter _tmp8_;
 #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 5082 "Tree.c"
+#line 5208 "Tree.c"
 					GtkTreeStore* _tmp6_;
 					gboolean _tmp7_;
 #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
 #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
+					_tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &child_iter);
 #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					if (!_tmp7_) {
 #line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 5093 "Tree.c"
+#line 5219 "Tree.c"
 					}
 				}
 #line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5098,20 +5224,25 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 				_tmp8_ = child_iter;
 #line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 5102 "Tree.c"
+#line 5228 "Tree.c"
 			}
 		}
 	}
 }
 
 
-static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected) {
+static gboolean
+sidebar_tree_on_selection (SidebarTree* self,
+                           GtkTreeSelection* selection,
+                           GtkTreeModel* model,
+                           GtkTreePath* path,
+                           gboolean path_currently_selected)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_;
-	SidebarTreeEntryWrapper* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarTreeEntryWrapper* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	SidebarTreeEntryWrapper* _tmp2_;
 #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5121,127 +5252,127 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 #line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
 #line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = path;
-#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper_at_path (self, path);
 #line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ != NULL) {
-#line 5134 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp4_;
-		SidebarEntry* _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 5263 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp3_;
+		SidebarEntry* _tmp4_;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = wrapper;
+		_tmp3_ = wrapper;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _tmp4_->entry;
+		_tmp4_ = _tmp3_->entry;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5143 "Tree.c"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+#line 5272 "Tree.c"
 	} else {
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = FALSE;
-#line 5147 "Tree.c"
+		_tmp1_ = FALSE;
+#line 5276 "Tree.c"
 	}
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5155 "Tree.c"
+#line 5284 "Tree.c"
 }
 
 
-static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEventButton* event) {
+static GtkTreePath*
+sidebar_tree_get_path_from_event (SidebarTree* self,
+                                  GdkEventButton* event)
+{
 	GtkTreePath* result = NULL;
 	gint x = 0;
 	gint y = 0;
 	GdkModifierType mask = 0;
-	GdkEventButton* _tmp0_;
-	GdkWindow* _tmp1_;
-	GdkDisplay* _tmp2_;
-	GdkDeviceManager* _tmp3_;
-	GdkDevice* _tmp4_;
+	GdkWindow* _tmp0_;
+	GdkDisplay* _tmp1_;
+	GdkDeviceManager* _tmp2_;
+	GdkDevice* _tmp3_;
+	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	GdkModifierType _tmp7_ = 0;
+	GdkModifierType _tmp6_ = 0;
 	gint cell_x = 0;
 	gint cell_y = 0;
 	GtkTreePath* path = NULL;
-	GtkTreePath* _tmp8_ = NULL;
+	GtkTreePath* _tmp7_ = NULL;
+	gint _tmp8_;
 	gint _tmp9_;
-	gint _tmp10_;
-	GtkTreePath* _tmp11_ = NULL;
+	GtkTreePath* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	gboolean _tmp14_;
-	GtkTreePath* _tmp16_;
+	gboolean _tmp13_;
+	GtkTreePath* _tmp15_;
 #line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, NULL);
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->window;
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->window;
+	_tmp1_ = gdk_display_get_default ();
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gdk_display_get_default ();
+	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = gdk_display_get_device_manager (_tmp2_);
+	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_);
+	gdk_window_get_device_position (_tmp0_, _tmp3_, &_tmp4_, &_tmp5_, &_tmp6_);
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
+	x = _tmp4_;
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	x = _tmp5_;
+	y = _tmp5_;
 #line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	y = _tmp6_;
-#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	mask = _tmp7_;
+	mask = _tmp6_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = x;
+	_tmp8_ = x;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = y;
+	_tmp9_ = y;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_);
+	_tmp13_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, _tmp9_, &_tmp10_, NULL, &_tmp11_, &_tmp12_);
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	path = _tmp11_;
+	path = _tmp10_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	cell_x = _tmp12_;
+	cell_x = _tmp11_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	cell_y = _tmp13_;
+	cell_y = _tmp12_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp14_) {
-#line 5221 "Tree.c"
-		GtkTreePath* _tmp15_;
+	if (_tmp13_) {
+#line 5350 "Tree.c"
+		GtkTreePath* _tmp14_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp15_ = path;
+		_tmp14_ = path;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = _tmp15_;
-#line 5227 "Tree.c"
+		_tmp7_ = _tmp14_;
+#line 5356 "Tree.c"
 	} else {
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = NULL;
-#line 5231 "Tree.c"
+		_tmp7_ = NULL;
+#line 5360 "Tree.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
+	_tmp15_ = __vala_GtkTreePath_copy0 (_tmp7_);
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp16_;
+	result = _tmp15_;
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5241 "Tree.c"
+#line 5370 "Tree.c"
 }
 
 
-static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
+static GtkTreePath*
+sidebar_tree_get_current_path (SidebarTree* self)
+{
 	GtkTreePath* result = NULL;
 	GtkTreeModel* model = NULL;
 	GList* rows = NULL;
@@ -5251,11 +5382,9 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GtkTreeModel* _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	GList* _tmp5_;
-	guint _tmp6_;
-	GtkTreePath* _tmp9_ = NULL;
-	GList* _tmp10_;
-	guint _tmp11_;
-	GtkTreePath* _tmp14_;
+	GtkTreePath* _tmp7_ = NULL;
+	GList* _tmp8_;
+	GtkTreePath* _tmp11_;
 #line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
 #line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5273,61 +5402,56 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = rows;
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = g_list_length (_tmp5_);
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp6_ == ((guint) 0)) {
+	if (g_list_length (_tmp5_) == ((guint) 0)) {
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5282 "Tree.c"
+#line 5409 "Tree.c"
 	} else {
-		GList* _tmp7_;
-		guint _tmp8_;
+		GList* _tmp6_;
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = rows;
+		_tmp6_ = rows;
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = g_list_length (_tmp7_);
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5292 "Tree.c"
+		_tmp4_ = g_list_length (_tmp6_) == ((guint) 1);
+#line 5416 "Tree.c"
 	}
 #line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = rows;
+	_tmp8_ = rows;
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = g_list_length (_tmp10_);
+	if (g_list_length (_tmp8_) != ((guint) 0)) {
+#line 5424 "Tree.c"
+		GList* _tmp9_;
+		gconstpointer _tmp10_;
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp11_ != ((guint) 0)) {
-#line 5302 "Tree.c"
-		GList* _tmp12_;
-		gconstpointer _tmp13_;
+		_tmp9_ = rows;
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = rows;
+		_tmp10_ = g_list_nth_data (_tmp9_, (guint) 0);
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5311 "Tree.c"
+		_tmp7_ = (GtkTreePath*) _tmp10_;
+#line 5433 "Tree.c"
 	} else {
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = NULL;
-#line 5315 "Tree.c"
+		_tmp7_ = NULL;
+#line 5437 "Tree.c"
 	}
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
+	_tmp11_ = __vala_GtkTreePath_copy0 (_tmp7_);
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp14_;
+	result = _tmp11_;
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	__g_list_free__gtk_tree_path_free0_0 (rows);
+	__g_list_free___vala_GtkTreePath_free0_0 (rows);
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
 #line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5327 "Tree.c"
+#line 5449 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
+static gboolean
+sidebar_tree_on_context_menu_keypress (SidebarTree* self)
+{
 	gboolean result = FALSE;
 	GList* rows = NULL;
 	GtkTreeSelection* _tmp0_;
@@ -5340,7 +5464,6 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	GtkTreePath* _tmp6_;
 	GtkTreePath* _tmp7_;
 	GtkTreePath* _tmp8_;
-	gboolean _tmp9_;
 #line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5356,17 +5479,17 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		__g_list_free__gtk_tree_path_free0_0 (rows);
+		__g_list_free___vala_GtkTreePath_free0_0 (rows);
 #line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5363 "Tree.c"
+#line 5486 "Tree.c"
 	}
 #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
 #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->data;
 #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_);
+	_tmp5_ = __vala_GtkTreePath_copy0 ((GtkTreePath*) _tmp4_);
 #line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp5_;
 #line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5376,12 +5499,12 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		__g_list_free__gtk_tree_path_free0_0 (rows);
+		__g_list_free___vala_GtkTreePath_free0_0 (rows);
 #line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5385 "Tree.c"
+#line 5508 "Tree.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
@@ -5390,77 +5513,74 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = path;
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp9_;
+	result = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	__g_list_free__gtk_tree_path_free0_0 (rows);
+	__g_list_free___vala_GtkTreePath_free0_0 (rows);
 #line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5403 "Tree.c"
+#line 5524 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath* path, GdkEventButton* event) {
+static gboolean
+sidebar_tree_popup_context_menu (SidebarTree* self,
+                                 GtkTreePath* path,
+                                 GdkEventButton* event)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-	SidebarTreeEntryWrapper* _tmp2_;
 	SidebarContextable* contextable = NULL;
-	SidebarTreeEntryWrapper* _tmp3_;
-	SidebarEntry* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarContextable* _tmp4_;
 	SidebarContextable* _tmp5_;
-	SidebarContextable* _tmp6_;
 	SidebarSelectableEntry* selectable = NULL;
-	SidebarTreeEntryWrapper* _tmp7_;
-	SidebarEntry* _tmp8_;
+	SidebarTreeEntryWrapper* _tmp6_;
+	SidebarEntry* _tmp7_;
+	SidebarSelectableEntry* _tmp8_;
 	SidebarSelectableEntry* _tmp9_;
-	SidebarSelectableEntry* _tmp10_;
 	GtkMenu* context_menu = NULL;
-	SidebarContextable* _tmp12_;
-	GdkEventButton* _tmp13_;
+	SidebarContextable* _tmp11_;
+	GtkMenu* _tmp12_;
+	GtkMenu* _tmp13_;
 	GtkMenu* _tmp14_;
-	GtkMenu* _tmp15_;
-	GtkMenu* _tmp16_;
-	GtkWidget* _tmp17_;
-	GdkEventButton* _tmp19_;
+	GtkWidget* _tmp15_;
 #line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
 #line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = path;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper_at_path (self, path);
 #line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5451 "Tree.c"
+#line 5571 "Tree.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = _tmp3_->entry;
+	_tmp3_ = _tmp2_->entry;
 #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL);
+	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp3_) : NULL);
 #line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	contextable = _tmp5_;
+	contextable = _tmp4_;
 #line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = contextable;
+	_tmp5_ = contextable;
 #line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp6_ == NULL) {
+	if (_tmp5_ == NULL) {
 #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5469,40 +5589,38 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5473 "Tree.c"
+#line 5593 "Tree.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = wrapper;
+	_tmp6_ = wrapper;
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = _tmp7_->entry;
+	_tmp7_ = _tmp6_->entry;
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL);
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL);
 #line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	selectable = _tmp9_;
+	selectable = _tmp8_;
 #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = selectable;
+	_tmp9_ = selectable;
 #line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp10_ != NULL) {
-#line 5487 "Tree.c"
-		SidebarSelectableEntry* _tmp11_;
+	if (_tmp9_ != NULL) {
+#line 5607 "Tree.c"
+		SidebarSelectableEntry* _tmp10_;
 #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = selectable;
+		_tmp10_ = selectable;
 #line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_);
-#line 5493 "Tree.c"
+		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp10_);
+#line 5613 "Tree.c"
 	}
 #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = contextable;
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = event;
+	_tmp11_ = contextable;
 #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_);
+	_tmp12_ = sidebar_contextable_get_sidebar_context_menu (_tmp11_, event);
 #line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	context_menu = _tmp14_;
+	context_menu = _tmp12_;
 #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = context_menu;
+	_tmp13_ = context_menu;
 #line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp15_ == NULL) {
+	if (_tmp13_ == NULL) {
 #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5515,55 +5633,44 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 		_g_object_unref0 (wrapper);
 #line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5519 "Tree.c"
+#line 5637 "Tree.c"
 	}
 #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = context_menu;
+	_tmp14_ = context_menu;
 #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
+	_tmp15_ = gtk_menu_get_attach_widget (_tmp14_);
 #line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp17_ == NULL) {
-#line 5527 "Tree.c"
-		GtkMenu* _tmp18_;
+	if (_tmp15_ == NULL) {
+#line 5645 "Tree.c"
+		GtkMenu* _tmp16_;
 #line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp18_ = context_menu;
+		_tmp16_ = context_menu;
 #line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 5533 "Tree.c"
+		gtk_menu_attach_to_widget (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 5651 "Tree.c"
 	}
 #line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = event;
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp19_ != NULL) {
-#line 5539 "Tree.c"
-		GtkMenu* _tmp20_;
-		GdkEventButton* _tmp21_;
-		guint _tmp22_;
-		GdkEventButton* _tmp23_;
-		guint32 _tmp24_;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp20_ = context_menu;
+	if (event != NULL) {
+#line 5655 "Tree.c"
+		GtkMenu* _tmp17_;
+		guint _tmp18_;
+		guint32 _tmp19_;
 #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp21_ = event;
+		_tmp17_ = context_menu;
 #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ = _tmp21_->button;
+		_tmp18_ = event->button;
 #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = event;
+		_tmp19_ = event->time;
 #line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp24_ = _tmp23_->time;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5557 "Tree.c"
+		gtk_menu_popup (_tmp17_, NULL, NULL, NULL, NULL, _tmp18_, _tmp19_);
+#line 5667 "Tree.c"
 	} else {
-		GtkMenu* _tmp25_;
-		guint32 _tmp26_;
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp25_ = context_menu;
+		GtkMenu* _tmp20_;
 #line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp26_ = gtk_get_current_event_time ();
+		_tmp20_ = context_menu;
 #line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5567 "Tree.c"
+		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, (guint) 0, gtk_get_current_event_time ());
+#line 5674 "Tree.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
@@ -5577,17 +5684,18 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	_g_object_unref0 (wrapper);
 #line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5581 "Tree.c"
+#line 5688 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkEventButton* event) {
+static gboolean
+sidebar_tree_popup_default_context_menu (SidebarTree* self,
+                                         GdkEventButton* event)
+{
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_;
-	GdkEventButton* _tmp1_;
-	guint _tmp2_;
-	GdkEventButton* _tmp3_;
-	guint32 _tmp4_;
+	guint _tmp1_;
+	guint32 _tmp2_;
 #line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5595,24 +5703,24 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
 #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = event;
-#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = _tmp1_->button;
+	_tmp1_ = event->button;
 #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = event;
+	_tmp2_ = event->time;
 #line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = _tmp3_->time;
-#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
+	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp1_, _tmp2_);
 #line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5612 "Tree.c"
+#line 5716 "Tree.c"
 }
 
 
-gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTreePath* path) {
+gboolean
+sidebar_tree_on_toggle_row (SidebarTree* self,
+                            GtkTreeIter* iter,
+                            GtkTreePath* path)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GtkTreeIter _tmp0_;
@@ -5622,9 +5730,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	GtkTreePath* _tmp6_;
-	gboolean _tmp7_;
-	gboolean _tmp16_;
+	gboolean _tmp13_;
 #line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -5647,7 +5753,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 		_g_object_unref0 (wrapper);
 #line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5651 "Tree.c"
+#line 5757 "Tree.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
@@ -5656,90 +5762,83 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 #line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = path;
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_);
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp7_) {
-#line 5665 "Tree.c"
-		GtkTreeStore* _tmp8_;
-		GtkTreeIter _tmp9_;
-		gboolean _tmp10_;
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp8_ = self->priv->store;
+	if (gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), path)) {
+#line 5767 "Tree.c"
+		GtkTreeStore* _tmp6_;
+		GtkTreeIter _tmp7_;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = *iter;
+		_tmp6_ = self->priv->store;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_);
+		_tmp7_ = *iter;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _tmp10_;
-#line 5677 "Tree.c"
+		_tmp5_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tree_model_get_type (), GtkTreeModel), &_tmp7_);
+#line 5776 "Tree.c"
 	} else {
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5681 "Tree.c"
+#line 5780 "Tree.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5685 "Tree.c"
-		SidebarTreeEntryWrapper* _tmp11_;
-		SidebarEntry* _tmp12_;
+#line 5784 "Tree.c"
+		SidebarTreeEntryWrapper* _tmp8_;
+		SidebarEntry* _tmp9_;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = wrapper;
+		_tmp8_ = wrapper;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = _tmp11_->entry;
+		_tmp9_ = _tmp8_->entry;
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5694 "Tree.c"
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
+#line 5793 "Tree.c"
 	} else {
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5698 "Tree.c"
+#line 5797 "Tree.c"
 	}
 #line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5702 "Tree.c"
-		gint _tmp13_;
-		gint _tmp14_;
+#line 5801 "Tree.c"
+		gint _tmp10_;
+		gint _tmp11_;
 #line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = self->priv->expander_special_count;
+		_tmp10_ = self->priv->expander_special_count;
 #line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		self->priv->expander_special_count = _tmp13_ + 1;
+		self->priv->expander_special_count = _tmp10_ + 1;
 #line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = self->priv->expander_special_count;
+		_tmp11_ = self->priv->expander_special_count;
 #line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp14_ == 1) {
+		if (_tmp11_ == 1) {
 #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
 #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
 #line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5719 "Tree.c"
+#line 5818 "Tree.c"
 		} else {
-			gboolean _tmp15_;
+			gboolean _tmp12_;
 #line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp15_ = should_allow_toggle;
+			_tmp12_ = should_allow_toggle;
 #line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			should_allow_toggle = !_tmp15_;
-#line 5726 "Tree.c"
+			should_allow_toggle = !_tmp12_;
+#line 5825 "Tree.c"
 		}
 	} else {
 #line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5731 "Tree.c"
+#line 5830 "Tree.c"
 	}
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = should_allow_toggle;
+	_tmp13_ = should_allow_toggle;
 #line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp16_) {
+	if (_tmp13_) {
 #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5743 "Tree.c"
+#line 5842 "Tree.c"
 	}
 #line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
@@ -5747,622 +5846,546 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	_g_object_unref0 (wrapper);
 #line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5751 "Tree.c"
+#line 5850 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
+static gboolean
+sidebar_tree_real_button_press_event (GtkWidget* base,
+                                      GdkEventButton* event)
+{
 	SidebarTree * self;
 	gboolean result = FALSE;
 	GtkTreePath* path = NULL;
-	GdkEventButton* _tmp0_;
-	GtkTreePath* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	GtkTreePath* _tmp3_;
-	gboolean _tmp6_ = FALSE;
-	GdkEventButton* _tmp7_;
-	guint _tmp8_;
-	GdkEventButton* _tmp58_;
-	gboolean _tmp59_;
+	GtkTreePath* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	GtkTreePath* _tmp2_;
+	gboolean _tmp4_ = FALSE;
+	guint _tmp5_;
 #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = event;
+	_tmp0_ = sidebar_tree_get_path_from_event (self, event);
 #line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	path = _tmp1_;
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = path;
+	path = _tmp0_;
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ == NULL) {
-#line 5782 "Tree.c"
-		GdkEventButton* _tmp4_;
-		guint _tmp5_;
+	_tmp2_ = path;
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = event;
+	if (_tmp2_ == NULL) {
+#line 5878 "Tree.c"
+		guint _tmp3_;
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = _tmp4_->button;
+		_tmp3_ = event->button;
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5791 "Tree.c"
+		_tmp1_ = _tmp3_ != ((guint) 3);
+#line 5884 "Tree.c"
 	} else {
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = FALSE;
-#line 5795 "Tree.c"
+		_tmp1_ = FALSE;
+#line 5888 "Tree.c"
 	}
 #line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_) {
+	if (_tmp1_) {
 #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
 #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5805 "Tree.c"
+#line 5898 "Tree.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = event;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = _tmp7_->button;
+	_tmp5_ = event->button;
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp8_ == ((guint) 3)) {
-#line 5813 "Tree.c"
-		GdkEventButton* _tmp9_;
-		GdkEventType _tmp10_;
+	if (_tmp5_ == ((guint) 3)) {
+#line 5904 "Tree.c"
+		GdkEventType _tmp6_;
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = event;
+		_tmp6_ = event->type;
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = _tmp9_->type;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5822 "Tree.c"
+		_tmp4_ = _tmp6_ == GDK_BUTTON_PRESS;
+#line 5910 "Tree.c"
 	} else {
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = FALSE;
-#line 5826 "Tree.c"
+		_tmp4_ = FALSE;
+#line 5914 "Tree.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp6_) {
-#line 5830 "Tree.c"
-		GtkTreePath* _tmp11_;
+	if (_tmp4_) {
+#line 5918 "Tree.c"
+		GtkTreePath* _tmp7_;
 #line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = path;
+		_tmp7_ = path;
 #line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp11_ != NULL) {
-#line 5836 "Tree.c"
-			GtkTreePath* _tmp12_;
-			GdkEventButton* _tmp13_;
-#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp12_ = path;
+		if (_tmp7_ != NULL) {
+#line 5924 "Tree.c"
+			GtkTreePath* _tmp8_;
 #line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp13_ = event;
+			_tmp8_ = path;
 #line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5845 "Tree.c"
+			sidebar_tree_popup_context_menu (self, _tmp8_, event);
+#line 5930 "Tree.c"
 		} else {
-			GdkEventButton* _tmp14_;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp14_ = event;
 #line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5852 "Tree.c"
+			sidebar_tree_popup_default_context_menu (self, event);
+#line 5934 "Tree.c"
 		}
 	} else {
-		gboolean _tmp15_ = FALSE;
-		GdkEventButton* _tmp16_;
-		guint _tmp17_;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = event;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp17_ = _tmp16_->button;
+		gboolean _tmp9_ = FALSE;
+		guint _tmp10_;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp17_ == ((guint) 1)) {
-#line 5864 "Tree.c"
-			GdkEventButton* _tmp18_;
-			GdkEventType _tmp19_;
+		_tmp10_ = event->button;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = event;
+		if (_tmp10_ == ((guint) 1)) {
+#line 5943 "Tree.c"
+			GdkEventType _tmp11_;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp19_ = _tmp18_->type;
+			_tmp11_ = event->type;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5873 "Tree.c"
+			_tmp9_ = _tmp11_ == GDK_BUTTON_PRESS;
+#line 5949 "Tree.c"
 		} else {
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp15_ = FALSE;
-#line 5877 "Tree.c"
+			_tmp9_ = FALSE;
+#line 5953 "Tree.c"
 		}
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp15_) {
-#line 5881 "Tree.c"
-			GtkTreePath* _tmp20_;
+		if (_tmp9_) {
+#line 5957 "Tree.c"
+			GtkTreePath* _tmp12_;
 			SidebarTreeEntryWrapper* wrapper = NULL;
-			GtkTreePath* _tmp23_;
-			SidebarTreeEntryWrapper* _tmp24_;
-			SidebarTreeEntryWrapper* _tmp25_;
-			gboolean _tmp28_ = FALSE;
-			SidebarTreeEntryWrapper* _tmp29_;
-			SidebarEntry* _tmp30_;
-			gboolean _tmp34_ = FALSE;
-			gboolean _tmp35_ = FALSE;
-			const GtkTreeRowReference* _tmp36_;
-			gboolean _tmp48_ = FALSE;
-			SidebarTreeEntryWrapper* _tmp49_;
-			SidebarEntry* _tmp50_;
-			GtkTreeStore* _tmp55_;
-			GtkTreePath* _tmp56_;
-			GtkTreeRowReference* _tmp57_;
+			GtkTreePath* _tmp13_;
+			SidebarTreeEntryWrapper* _tmp14_;
+			SidebarTreeEntryWrapper* _tmp15_;
+			gboolean _tmp16_ = FALSE;
+			SidebarTreeEntryWrapper* _tmp17_;
+			SidebarEntry* _tmp18_;
+			gboolean _tmp22_ = FALSE;
+			gboolean _tmp23_ = FALSE;
+			GtkTreeRowReference* _tmp24_;
+			gboolean _tmp33_ = FALSE;
+			SidebarTreeEntryWrapper* _tmp34_;
+			SidebarEntry* _tmp35_;
+			GtkTreeStore* _tmp39_;
+			GtkTreePath* _tmp40_;
+			GtkTreeRowReference* _tmp41_;
 #line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = path;
+			_tmp12_ = path;
 #line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp20_ == NULL) {
-#line 5903 "Tree.c"
-				GdkEventButton* _tmp21_;
-				gboolean _tmp22_;
+			if (_tmp12_ == NULL) {
 #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
+				__vala_GtkTreeRowReference_free0 (self->priv->old_path_ref);
 #line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
 #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp21_ = event;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp22_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_);
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				result = _tmp22_;
+				result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event);
 #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (path);
+				__vala_GtkTreePath_free0 (path);
 #line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5920 "Tree.c"
+#line 5989 "Tree.c"
 			}
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp23_ = path;
+			_tmp13_ = path;
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
+			_tmp14_ = sidebar_tree_get_wrapper_at_path (self, _tmp13_);
 #line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			wrapper = _tmp24_;
+			wrapper = _tmp14_;
 #line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp25_ = wrapper;
+			_tmp15_ = wrapper;
 #line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp25_ == NULL) {
-#line 5932 "Tree.c"
-				GdkEventButton* _tmp26_;
-				gboolean _tmp27_;
+			if (_tmp15_ == NULL) {
 #line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
+				__vala_GtkTreeRowReference_free0 (self->priv->old_path_ref);
 #line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp26_ = event;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp27_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_);
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				result = _tmp27_;
+				result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event);
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (path);
+				__vala_GtkTreePath_free0 (path);
 #line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5951 "Tree.c"
+#line 6013 "Tree.c"
 			}
 #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp29_ = wrapper;
+			_tmp17_ = wrapper;
 #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp30_ = _tmp29_->entry;
+			_tmp18_ = _tmp17_->entry;
 #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
 #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp28_ = TRUE;
-#line 5961 "Tree.c"
+				_tmp16_ = TRUE;
+#line 6023 "Tree.c"
 			} else {
-				SidebarTreeEntryWrapper* _tmp31_;
-				SidebarEntry* _tmp32_;
+				SidebarTreeEntryWrapper* _tmp19_;
+				SidebarEntry* _tmp20_;
 #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp31_ = wrapper;
+				_tmp19_ = wrapper;
 #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp32_ = _tmp31_->entry;
+				_tmp20_ = _tmp19_->entry;
 #line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5971 "Tree.c"
+				_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
+#line 6033 "Tree.c"
 			}
 #line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp28_) {
-#line 5975 "Tree.c"
-				GtkTreePath* _tmp33_;
+			if (_tmp16_) {
+#line 6037 "Tree.c"
+				GtkTreePath* _tmp21_;
 #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp33_ = path;
+				_tmp21_ = path;
 #line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5981 "Tree.c"
+				sidebar_tree_toggle_branch_expansion (self, _tmp21_, FALSE);
+#line 6043 "Tree.c"
 			}
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp36_ = self->priv->old_path_ref;
+			_tmp24_ = self->priv->old_path_ref;
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp36_ != NULL) {
-#line 5987 "Tree.c"
-				const GtkTreeRowReference* _tmp37_;
-				GtkTreePath* _tmp38_;
-				GtkTreePath* _tmp39_;
+			if (_tmp24_ != NULL) {
+#line 6049 "Tree.c"
+				GtkTreeRowReference* _tmp25_;
+				GtkTreePath* _tmp26_;
+				GtkTreePath* _tmp27_;
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp37_ = self->priv->old_path_ref;
+				_tmp25_ = self->priv->old_path_ref;
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
+				_tmp26_ = gtk_tree_row_reference_get_path (_tmp25_);
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp39_ = _tmp38_;
+				_tmp27_ = _tmp26_;
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp35_ = _tmp39_ != NULL;
+				_tmp23_ = _tmp27_ != NULL;
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (_tmp39_);
-#line 6001 "Tree.c"
+				__vala_GtkTreePath_free0 (_tmp27_);
+#line 6063 "Tree.c"
 			} else {
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp35_ = FALSE;
-#line 6005 "Tree.c"
+				_tmp23_ = FALSE;
+#line 6067 "Tree.c"
 			}
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp35_) {
-#line 6009 "Tree.c"
-				const GtkTreeRowReference* _tmp40_;
-				GtkTreePath* _tmp41_;
-				GtkTreePath* _tmp42_;
-				GtkTreePath* _tmp43_;
-				gint _tmp44_;
+			if (_tmp23_) {
+#line 6071 "Tree.c"
+				GtkTreeRowReference* _tmp28_;
+				GtkTreePath* _tmp29_;
+				GtkTreePath* _tmp30_;
+				GtkTreePath* _tmp31_;
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp40_ = self->priv->old_path_ref;
+				_tmp28_ = self->priv->old_path_ref;
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
+				_tmp29_ = gtk_tree_row_reference_get_path (_tmp28_);
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp42_ = _tmp41_;
+				_tmp30_ = _tmp29_;
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp43_ = path;
+				_tmp31_ = path;
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
+				_tmp22_ = gtk_tree_path_compare (_tmp30_, _tmp31_) == 0;
 #line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp34_ = _tmp44_ == 0;
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (_tmp42_);
-#line 6029 "Tree.c"
+				__vala_GtkTreePath_free0 (_tmp30_);
+#line 6088 "Tree.c"
 			} else {
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp34_ = FALSE;
-#line 6033 "Tree.c"
+				_tmp22_ = FALSE;
+#line 6092 "Tree.c"
 			}
 #line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp34_) {
-#line 6037 "Tree.c"
-				GtkCellRendererText* _tmp45_;
-				GdkEventButton* _tmp46_;
-				gboolean _tmp47_;
+			if (_tmp22_) {
+#line 6096 "Tree.c"
+				GtkCellRendererText* _tmp32_;
 #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp45_ = self->priv->text_renderer;
+				_tmp32_ = self->priv->text_renderer;
 #line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp46_ = event;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp47_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp46_);
+				g_object_set (_tmp32_, "editable", FALSE, NULL);
 #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				result = _tmp47_;
+				result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event);
 #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
 #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (path);
+				__vala_GtkTreePath_free0 (path);
 #line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6057 "Tree.c"
+#line 6110 "Tree.c"
 			}
 #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp49_ = wrapper;
+			_tmp34_ = wrapper;
 #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp50_ = _tmp49_->entry;
+			_tmp35_ = _tmp34_->entry;
 #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 6065 "Tree.c"
-				SidebarTreeEntryWrapper* _tmp51_;
-				SidebarEntry* _tmp52_;
-				gboolean _tmp53_;
-#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp51_ = wrapper;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
+#line 6118 "Tree.c"
+				SidebarTreeEntryWrapper* _tmp36_;
+				SidebarEntry* _tmp37_;
 #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp52_ = _tmp51_->entry;
+				_tmp36_ = wrapper;
 #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
+				_tmp37_ = _tmp36_->entry;
 #line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp48_ = _tmp53_;
-#line 6077 "Tree.c"
+				_tmp33_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
+#line 6127 "Tree.c"
 			} else {
 #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp48_ = FALSE;
-#line 6081 "Tree.c"
+				_tmp33_ = FALSE;
+#line 6131 "Tree.c"
 			}
 #line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			if (_tmp48_) {
-#line 6085 "Tree.c"
-				GtkCellRendererText* _tmp54_;
+			if (_tmp33_) {
+#line 6135 "Tree.c"
+				GtkCellRendererText* _tmp38_;
 #line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp54_ = self->priv->text_renderer;
+				_tmp38_ = self->priv->text_renderer;
 #line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 6091 "Tree.c"
+				g_object_set (_tmp38_, "editable", TRUE, NULL);
+#line 6141 "Tree.c"
 			}
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp55_ = self->priv->store;
+			_tmp39_ = self->priv->store;
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp56_ = path;
+			_tmp40_ = path;
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp57_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp56_);
+			_tmp41_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tree_model_get_type (), GtkTreeModel), _tmp40_);
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
+			__vala_GtkTreeRowReference_free0 (self->priv->old_path_ref);
 #line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			self->priv->old_path_ref = _tmp57_;
+			self->priv->old_path_ref = _tmp41_;
 #line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 6105 "Tree.c"
+#line 6155 "Tree.c"
 		}
 	}
 #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp58_ = event;
-#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp59_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp58_);
+	result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event);
 #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp59_;
-#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6118 "Tree.c"
+#line 6164 "Tree.c"
 }
 
 
-gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event) {
+gboolean
+sidebar_tree_is_keypress_interpreted (SidebarTree* self,
+                                      GdkEventKey* event)
+{
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	GQuark _tmp5_ = 0U;
+	GQuark _tmp4_ = 0U;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label0 = 0;
+	static GQuark _tmp3_label0 = 0;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label1 = 0;
+	static GQuark _tmp3_label1 = 0;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label2 = 0;
+	static GQuark _tmp3_label2 = 0;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label3 = 0;
+	static GQuark _tmp3_label3 = 0;
 #line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = event;
-#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp0_ = event->keyval;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) {
+	if ((((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("F2")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("Return"))))) || (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6155 "Tree.c"
+#line 6201 "Tree.c"
 			default:
 			{
 #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
 #line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6162 "Tree.c"
+#line 6208 "Tree.c"
 			}
 		}
 	} else {
 #line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6168 "Tree.c"
+#line 6214 "Tree.c"
 			default:
 			{
 #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
 #line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6175 "Tree.c"
+#line 6221 "Tree.c"
 			}
 		}
 	}
 }
 
 
-static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+sidebar_tree_real_key_press_event (GtkWidget* base,
+                                   GdkEventKey* event)
+{
 	SidebarTree * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	GQuark _tmp5_ = 0U;
+	GQuark _tmp4_ = 0U;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label0 = 0;
+	static GQuark _tmp3_label0 = 0;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label1 = 0;
+	static GQuark _tmp3_label1 = 0;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label2 = 0;
+	static GQuark _tmp3_label2 = 0;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label3 = 0;
-#line 6198 "Tree.c"
-	GdkEventKey* _tmp15_;
-	gboolean _tmp16_;
+	static GQuark _tmp3_label3 = 0;
 #line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = event;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp0_ = event->keyval;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) {
+	if ((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Return")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6219 "Tree.c"
+#line 6262 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
+				GtkTreePath* _tmp5_;
 				GtkTreePath* _tmp6_;
-				GtkTreePath* _tmp7_;
 #line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp6_ = sidebar_tree_get_current_path (self);
+				_tmp5_ = sidebar_tree_get_current_path (self);
 #line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				path = _tmp6_;
+				path = _tmp5_;
 #line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp7_ = path;
+				_tmp6_ = path;
 #line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				if (_tmp7_ != NULL) {
-#line 6233 "Tree.c"
-					GtkTreePath* _tmp8_;
+				if (_tmp6_ != NULL) {
+#line 6276 "Tree.c"
+					GtkTreePath* _tmp7_;
 #line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp8_ = path;
+					_tmp7_ = path;
 #line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6239 "Tree.c"
+					sidebar_tree_toggle_branch_expansion (self, _tmp7_, FALSE);
+#line 6282 "Tree.c"
 				}
 #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
 #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (path);
+				__vala_GtkTreePath_free0 (path);
 #line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6247 "Tree.c"
+#line 6290 "Tree.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("F2")))) {
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6253 "Tree.c"
+#line 6296 "Tree.c"
 			default:
 			{
-				gboolean _tmp9_;
 #line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				result = _tmp9_;
+				result = sidebar_tree_rename_in_place (self);
 #line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6263 "Tree.c"
+#line 6303 "Tree.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("Delete")))) {
 #line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6269 "Tree.c"
+#line 6309 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
+				GtkTreePath* _tmp8_;
+				gboolean _tmp9_ = FALSE;
 				GtkTreePath* _tmp10_;
-				gboolean _tmp11_ = FALSE;
-				GtkTreePath* _tmp12_;
 #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp10_ = sidebar_tree_get_current_path (self);
+				_tmp8_ = sidebar_tree_get_current_path (self);
 #line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				path = _tmp10_;
-#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_tmp12_ = path;
+				path = _tmp8_;
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				if (_tmp12_ != NULL) {
-#line 6284 "Tree.c"
-					GtkTreePath* _tmp13_;
-					gboolean _tmp14_;
+				_tmp10_ = path;
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp13_ = path;
+				if (_tmp10_ != NULL) {
+#line 6324 "Tree.c"
+					GtkTreePath* _tmp11_;
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
+					_tmp11_ = path;
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp11_ = _tmp14_;
-#line 6293 "Tree.c"
+					_tmp9_ = sidebar_tree_destroy_path (self, _tmp11_);
+#line 6330 "Tree.c"
 				} else {
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-					_tmp11_ = FALSE;
-#line 6297 "Tree.c"
+					_tmp9_ = FALSE;
+#line 6334 "Tree.c"
 				}
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				result = _tmp11_;
+				result = _tmp9_;
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-				_gtk_tree_path_free0 (path);
+				__vala_GtkTreePath_free0 (path);
 #line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6305 "Tree.c"
+#line 6342 "Tree.c"
 			}
 		}
 	}
 #line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = event;
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_);
-#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp16_;
+	result = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), event);
 #line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6317 "Tree.c"
+#line 6350 "Tree.c"
 }
 
 
-gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry) {
+gboolean
+sidebar_tree_rename_entry_in_place (SidebarTree* self,
+                                    SidebarEntry* entry)
+{
 	gboolean result = FALSE;
-	SidebarEntry* _tmp0_;
-	gboolean _tmp1_;
-	SidebarEntry* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
 #line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
 #line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp1_) {
+	if (!sidebar_tree_expand_to_entry (self, entry)) {
 #line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6342 "Tree.c"
+#line 6369 "Tree.c"
 	}
 #line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = entry;
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp3_) {
+	if (!sidebar_tree_place_cursor (self, entry, FALSE)) {
 #line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6354 "Tree.c"
+#line 6377 "Tree.c"
 	}
 #line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	result = _tmp4_;
+	result = sidebar_tree_rename_in_place (self);
 #line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6362 "Tree.c"
+#line 6383 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
+static gboolean
+sidebar_tree_rename_in_place (SidebarTree* self)
+{
 	gboolean result = FALSE;
 	GtkTreePath* cursor_path = NULL;
 	GtkTreeViewColumn* cursor_column = NULL;
@@ -6370,13 +6393,12 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp1_ = NULL;
 	GtkTreeViewColumn* _tmp2_;
 	GtkTreePath* _tmp3_;
-	gboolean _tmp4_;
 #line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_get_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), &_tmp0_, &_tmp1_);
 #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (cursor_path);
+	__vala_GtkTreePath_free0 (cursor_path);
 #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
 #line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6388,101 +6410,104 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 #line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
 #line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp4_) {
-#line 6395 "Tree.c"
-		GtkTreePath* _tmp5_;
-		GtkTreeViewColumn* _tmp6_;
-		GtkCellRendererText* _tmp7_;
+	if (sidebar_tree_can_rename_path (self, _tmp3_)) {
+#line 6415 "Tree.c"
+		GtkTreePath* _tmp4_;
+		GtkTreeViewColumn* _tmp5_;
+		GtkCellRendererText* _tmp6_;
 #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = cursor_path;
+		_tmp4_ = cursor_path;
 #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = cursor_column;
+		_tmp5_ = cursor_column;
 #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp7_ = self->priv->text_renderer;
+		_tmp6_ = self->priv->text_renderer;
 #line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+		gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
 #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
 #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (cursor_path);
+		__vala_GtkTreePath_free0 (cursor_path);
 #line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6415 "Tree.c"
+#line 6435 "Tree.c"
 	}
 #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
 #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
 #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (cursor_path);
+	__vala_GtkTreePath_free0 (cursor_path);
 #line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6425 "Tree.c"
+#line 6445 "Tree.c"
 }
 
 
-gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
+gboolean
+sidebar_tree_scroll_to_entry (SidebarTree* self,
+                              SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	SidebarEntry* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
+	GtkTreePath* _tmp3_;
 	GtkTreePath* _tmp4_;
-	GtkTreePath* _tmp5_;
 #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
 #line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper (self, entry);
 #line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6458 "Tree.c"
+#line 6478 "Tree.c"
 	}
 #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
+	_tmp3_ = sidebar_tree_entry_wrapper_get_path (_tmp2_);
 #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
+	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
 #line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp5_);
+	__vala_GtkTreePath_free0 (_tmp4_);
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6476 "Tree.c"
+#line 6496 "Tree.c"
 }
 
 
-static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time) {
+static void
+sidebar_tree_real_drag_data_get (GtkWidget* base,
+                                 GdkDragContext* context,
+                                 GtkSelectionData* selection_data,
+                                 guint info,
+                                 guint time)
+{
 	SidebarTree * self;
 	SidebarInternalDragSourceEntry* drag_source = NULL;
 	SidebarEntry* _tmp0_;
 	SidebarInternalDragSourceEntry* _tmp6_;
 	SidebarInternalDragSourceEntry* _tmp16_;
-	GtkSelectionData* _tmp17_;
 #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6495,7 +6520,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	_tmp0_ = self->priv->internal_drag_source_entry;
 #line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6499 "Tree.c"
+#line 6524 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_;
 		SidebarSelectableEntry* _tmp2_;
@@ -6510,7 +6535,7 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		_tmp3_ = selectable;
 #line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6514 "Tree.c"
+#line 6539 "Tree.c"
 			SidebarEntry* _tmp4_;
 			SidebarInternalDragSourceEntry* _tmp5_;
 #line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6521,17 +6546,17 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 			_g_object_unref0 (drag_source);
 #line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6525 "Tree.c"
+#line 6550 "Tree.c"
 		}
 #line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6529 "Tree.c"
+#line 6554 "Tree.c"
 	}
 #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
 #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6535 "Tree.c"
+#line 6560 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_;
 		GtkTreePath* _tmp8_;
@@ -6552,12 +6577,12 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 #line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
 #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_gtk_tree_path_free0 (selected_path);
+			__vala_GtkTreePath_free0 (selected_path);
 #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
 #line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6561 "Tree.c"
+#line 6586 "Tree.c"
 		}
 #line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
@@ -6572,12 +6597,12 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
 #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_gtk_tree_path_free0 (selected_path);
+			__vala_GtkTreePath_free0 (selected_path);
 #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
 #line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6581 "Tree.c"
+#line 6606 "Tree.c"
 		}
 #line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
@@ -6596,60 +6621,59 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
 #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_gtk_tree_path_free0 (selected_path);
+			__vala_GtkTreePath_free0 (selected_path);
 #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
 #line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6605 "Tree.c"
+#line 6630 "Tree.c"
 		}
 #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (selected_path);
-#line 6611 "Tree.c"
+		__vala_GtkTreePath_free0 (selected_path);
+#line 6636 "Tree.c"
 	}
 #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
 #line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = selection_data;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
+	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, selection_data);
 #line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6621 "Tree.c"
+#line 6644 "Tree.c"
 }
 
 
-static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) {
+static void
+sidebar_tree_real_drag_data_received (GtkWidget* base,
+                                      GdkDragContext* context,
+                                      gint x,
+                                      gint y,
+                                      GtkSelectionData* selection_data,
+                                      guint info,
+                                      guint time)
+{
 	SidebarTree * self;
 	GtkTreePath* path = NULL;
 	GtkTreeViewDropPosition pos = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	GtkTreePath* _tmp2_ = NULL;
-	GtkTreeViewDropPosition _tmp3_ = 0;
-	gboolean _tmp4_;
+	GtkTreePath* _tmp0_ = NULL;
+	GtkTreeViewDropPosition _tmp1_ = 0;
+	gboolean _tmp2_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp14_;
-	SidebarTreeEntryWrapper* _tmp15_;
-	GdkDragContext* _tmp16_;
-	GtkWidget* _tmp17_;
-	SidebarTreeEntryWrapper* _tmp27_;
+	GtkTreePath* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp6_;
+	GtkWidget* _tmp7_;
+	SidebarTreeEntryWrapper* _tmp13_;
 	SidebarInternalDropTargetEntry* targetable = NULL;
-	SidebarTreeEntryWrapper* _tmp30_;
-	SidebarEntry* _tmp31_;
-	SidebarInternalDropTargetEntry* _tmp32_;
-	SidebarInternalDropTargetEntry* _tmp33_;
+	SidebarTreeEntryWrapper* _tmp14_;
+	SidebarEntry* _tmp15_;
+	SidebarInternalDropTargetEntry* _tmp16_;
+	SidebarInternalDropTargetEntry* _tmp17_;
 	gboolean success = FALSE;
-	GtkSelectionData* _tmp36_;
-	GdkAtom _tmp37_;
-	gchar* _tmp38_;
-	gchar* _tmp39_;
-	gboolean _tmp40_;
-	GdkDragContext* _tmp57_;
-	gboolean _tmp58_;
-	guint _tmp59_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gboolean _tmp20_;
+	gboolean _tmp31_;
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -6657,415 +6681,313 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = x;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = y;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
+	_tmp2_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp0_, &_tmp1_);
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	path = _tmp2_;
+	path = _tmp0_;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	pos = _tmp3_;
+	pos = _tmp1_;
 #line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp4_) {
-#line 6674 "Tree.c"
-		GdkDragContext* _tmp5_;
-		GtkWidget* _tmp6_;
+	if (!_tmp2_) {
+#line 6694 "Tree.c"
+		GtkWidget* _tmp3_;
 #line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = context;
+		_tmp3_ = gtk_drag_get_source_widget (context);
 #line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp6_ == NULL) {
-#line 6683 "Tree.c"
-			SidebarTreeExternalDropHandler _tmp7_;
-			void* _tmp7__target;
-			GdkDragContext* _tmp8_;
-			GtkSelectionData* _tmp9_;
-			guint _tmp10_;
-			guint _tmp11_;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp7_ = self->priv->drop_handler;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp7__target = self->priv->drop_handler_target;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp8_ = context;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp9_ = selection_data;
+		if (_tmp3_ == NULL) {
+#line 6700 "Tree.c"
+			SidebarTreeExternalDropHandler _tmp4_;
+			void* _tmp4__target;
 #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp10_ = info;
+			_tmp4_ = self->priv->drop_handler;
 #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp11_ = time;
+			_tmp4__target = self->priv->drop_handler_target;
 #line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6704 "Tree.c"
+			_tmp4_ (context, NULL, selection_data, info, time, _tmp4__target);
+#line 6709 "Tree.c"
 		} else {
-			GdkDragContext* _tmp12_;
-			guint _tmp13_;
-#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp12_ = context;
 #line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp13_ = time;
-#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6714 "Tree.c"
+			gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
+#line 6713 "Tree.c"
 		}
 #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6720 "Tree.c"
+#line 6719 "Tree.c"
 	}
 #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = path;
+	_tmp5_ = path;
 #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
+	_tmp6_ = sidebar_tree_get_wrapper_at_path (self, _tmp5_);
 #line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp15_;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = context;
+	wrapper = _tmp6_;
 #line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
+	_tmp7_ = gtk_drag_get_source_widget (context);
 #line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp17_ == NULL) {
-#line 6734 "Tree.c"
-		SidebarEntry* _tmp18_ = NULL;
-		SidebarTreeEntryWrapper* _tmp19_;
-		SidebarTreeExternalDropHandler _tmp22_;
-		void* _tmp22__target;
-		GdkDragContext* _tmp23_;
-		GtkSelectionData* _tmp24_;
-		guint _tmp25_;
-		guint _tmp26_;
+	if (_tmp7_ == NULL) {
+#line 6731 "Tree.c"
+		SidebarEntry* _tmp8_ = NULL;
+		SidebarTreeEntryWrapper* _tmp9_;
+		SidebarTreeExternalDropHandler _tmp12_;
+		void* _tmp12__target;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp19_ = wrapper;
+		_tmp9_ = wrapper;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp19_ != NULL) {
-#line 6747 "Tree.c"
-			SidebarTreeEntryWrapper* _tmp20_;
-			SidebarEntry* _tmp21_;
+		if (_tmp9_ != NULL) {
+#line 6740 "Tree.c"
+			SidebarTreeEntryWrapper* _tmp10_;
+			SidebarEntry* _tmp11_;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp20_ = wrapper;
+			_tmp10_ = wrapper;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp21_ = _tmp20_->entry;
+			_tmp11_ = _tmp10_->entry;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = _tmp21_;
-#line 6756 "Tree.c"
+			_tmp8_ = _tmp11_;
+#line 6749 "Tree.c"
 		} else {
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp18_ = NULL;
-#line 6760 "Tree.c"
+			_tmp8_ = NULL;
+#line 6753 "Tree.c"
 		}
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ = self->priv->drop_handler;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22__target = self->priv->drop_handler_target;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = context;
+		_tmp12_ = self->priv->drop_handler;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp24_ = selection_data;
+		_tmp12__target = self->priv->drop_handler_target;
 #line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp25_ = info;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp26_ = time;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
+		_tmp12_ (context, _tmp8_, selection_data, info, time, _tmp12__target);
 #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6782 "Tree.c"
+#line 6767 "Tree.c"
 	}
 #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp27_ = wrapper;
+	_tmp13_ = wrapper;
 #line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp27_ == NULL) {
-#line 6788 "Tree.c"
-		GdkDragContext* _tmp28_;
-		guint _tmp29_;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp28_ = context;
+	if (_tmp13_ == NULL) {
 #line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp29_ = time;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
+		gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
 #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6803 "Tree.c"
+#line 6781 "Tree.c"
 	}
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp30_ = wrapper;
+	_tmp14_ = wrapper;
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp31_ = _tmp30_->entry;
+	_tmp15_ = _tmp14_->entry;
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp31_) : NULL);
+	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp15_) : NULL);
 #line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	targetable = _tmp32_;
+	targetable = _tmp16_;
 #line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp33_ = targetable;
+	_tmp17_ = targetable;
 #line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp33_ == NULL) {
-#line 6817 "Tree.c"
-		GdkDragContext* _tmp34_;
-		guint _tmp35_;
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp34_ = context;
-#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp35_ = time;
+	if (_tmp17_ == NULL) {
 #line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
+		gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
 #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
 #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_gtk_tree_path_free0 (path);
+		__vala_GtkTreePath_free0 (path);
 #line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6834 "Tree.c"
+#line 6805 "Tree.c"
 	}
 #line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp36_ = selection_data;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
+	_tmp18_ = gdk_atom_name (gtk_selection_data_get_data_type (selection_data));
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp38_ = gdk_atom_name (_tmp37_);
+	_tmp19_ = _tmp18_;
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp39_ = _tmp38_;
+	_tmp20_ = g_strcmp0 (_tmp19_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
+	_g_free0 (_tmp19_);
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (_tmp39_);
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp40_) {
-#line 6852 "Tree.c"
-		SidebarInternalDropTargetEntry* _tmp41_;
-		GtkSelectionData* _tmp42_;
-		gboolean _tmp43_;
-#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp41_ = targetable;
-#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp42_ = selection_data;
+	if (_tmp20_) {
+#line 6819 "Tree.c"
+		SidebarInternalDropTargetEntry* _tmp21_;
 #line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
+		_tmp21_ = targetable;
 #line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		success = _tmp43_;
-#line 6864 "Tree.c"
+		success = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp21_, selection_data);
+#line 6825 "Tree.c"
 	} else {
 		GeeList* media = NULL;
-		GtkSelectionData* _tmp44_;
-		guchar* _tmp45_;
-		GtkSelectionData* _tmp46_;
-		gint _tmp47_;
-		GeeList* _tmp48_;
-		gboolean _tmp49_ = FALSE;
-		GeeList* _tmp50_;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp44_ = selection_data;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
+		guint8* _tmp22_;
+		GeeList* _tmp23_;
+		gboolean _tmp24_ = FALSE;
+		GeeList* _tmp25_;
 #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp46_ = selection_data;
+		_tmp22_ = gtk_selection_data_get_data (selection_data);
 #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
+		_tmp23_ = unserialize_media_sources (_tmp22_, gtk_selection_data_get_length (selection_data));
 #line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		media = _tmp48_;
+		media = _tmp23_;
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp50_ = media;
+		_tmp25_ = media;
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp50_ != NULL) {
-#line 6890 "Tree.c"
-			GeeList* _tmp51_;
-			gint _tmp52_;
-			gint _tmp53_;
+		if (_tmp25_ != NULL) {
+#line 6842 "Tree.c"
+			GeeList* _tmp26_;
+			gint _tmp27_;
+			gint _tmp28_;
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp51_ = media;
+			_tmp26_ = media;
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp53_ = _tmp52_;
+			_tmp28_ = _tmp27_;
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp49_ = _tmp53_ > 0;
-#line 6902 "Tree.c"
+			_tmp24_ = _tmp28_ > 0;
+#line 6854 "Tree.c"
 		} else {
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp49_ = FALSE;
-#line 6906 "Tree.c"
+			_tmp24_ = FALSE;
+#line 6858 "Tree.c"
 		}
 #line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp49_) {
-#line 6910 "Tree.c"
-			SidebarInternalDropTargetEntry* _tmp54_;
-			GeeList* _tmp55_;
-			gboolean _tmp56_;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp54_ = targetable;
+		if (_tmp24_) {
+#line 6862 "Tree.c"
+			SidebarInternalDropTargetEntry* _tmp29_;
+			GeeList* _tmp30_;
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp55_ = media;
+			_tmp29_ = targetable;
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
+			_tmp30_ = media;
 #line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			success = _tmp56_;
-#line 6922 "Tree.c"
+			success = sidebar_internal_drop_target_entry_internal_drop_received (_tmp29_, _tmp30_);
+#line 6871 "Tree.c"
 		}
 #line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6926 "Tree.c"
+#line 6875 "Tree.c"
 	}
 #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp57_ = context;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp58_ = success;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp59_ = time;
+	_tmp31_ = success;
 #line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
+	gtk_drag_finish (context, _tmp31_, FALSE, (guint32) time);
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
 #line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
-#line 6942 "Tree.c"
+	__vala_GtkTreePath_free0 (path);
+#line 6887 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) {
+static gboolean
+sidebar_tree_real_drag_motion (GtkWidget* base,
+                               GdkDragContext* context,
+                               gint x,
+                               gint y,
+                               guint time)
+{
 	SidebarTree * self;
 	gboolean result = FALSE;
-	GdkDragContext* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	guint _tmp3_;
 	GtkTreePath* path = NULL;
 	GtkTreeViewDropPosition pos = 0;
 	gboolean has_dest = FALSE;
-	gint _tmp4_;
-	gint _tmp5_;
-	GtkTreePath* _tmp6_ = NULL;
-	GtkTreeViewDropPosition _tmp7_ = 0;
-	gboolean _tmp8_;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_;
-	GdkDragContext* _tmp15_;
-	GdkDragContext* _tmp16_;
-	GdkDragAction _tmp17_;
-	guint _tmp18_;
+	GtkTreePath* _tmp0_ = NULL;
+	GtkTreeViewDropPosition _tmp1_ = 0;
+	gboolean _tmp2_;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_;
 #line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
 #line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
 #line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = context;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = x;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = y;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = time;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_, _tmp2_, _tmp3_);
+	GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), context, x, y, time);
 #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = x;
+	_tmp2_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), x, y, &_tmp0_, &_tmp1_);
 #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = y;
+	__vala_GtkTreePath_free0 (path);
 #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	path = _tmp6_;
+	path = _tmp0_;
 #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	pos = _tmp7_;
+	pos = _tmp1_;
 #line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	has_dest = _tmp8_;
+	has_dest = _tmp2_;
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = has_dest;
+	_tmp4_ = has_dest;
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (!_tmp10_) {
+	if (!_tmp4_) {
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = TRUE;
-#line 7001 "Tree.c"
+		_tmp3_ = TRUE;
+#line 6930 "Tree.c"
 	} else {
-		GtkTreeViewDropPosition _tmp11_;
+		GtkTreeViewDropPosition _tmp5_;
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = pos;
+		_tmp5_ = pos;
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 7008 "Tree.c"
+		_tmp3_ = _tmp5_ == GTK_TREE_VIEW_DROP_BEFORE;
+#line 6937 "Tree.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp9_) {
-#line 7012 "Tree.c"
-		GtkTreePath* _tmp12_;
+	if (_tmp3_) {
+#line 6941 "Tree.c"
+		GtkTreePath* _tmp6_;
 #line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = path;
+		_tmp6_ = path;
 #line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 7018 "Tree.c"
+		gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
+#line 6947 "Tree.c"
 	} else {
-		GtkTreeViewDropPosition _tmp13_;
+		GtkTreeViewDropPosition _tmp7_;
 #line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = pos;
+		_tmp7_ = pos;
 #line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 7025 "Tree.c"
-			GtkTreePath* _tmp14_;
+		if (_tmp7_ == GTK_TREE_VIEW_DROP_AFTER) {
+#line 6954 "Tree.c"
+			GtkTreePath* _tmp8_;
 #line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			_tmp14_ = path;
+			_tmp8_ = path;
 #line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
-#line 7031 "Tree.c"
+			gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp8_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
+#line 6960 "Tree.c"
 		}
 	}
 #line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = context;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = context;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = time;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
+	gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), (guint32) time);
 #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
 #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (path);
+	__vala_GtkTreePath_free0 (path);
 #line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7050 "Tree.c"
+#line 6971 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* path) {
+static gboolean
+sidebar_tree_can_rename_path (SidebarTree* self,
+                              GtkTreePath* path)
+{
 	gboolean result = FALSE;
 	gint _tmp0_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp1_;
+	SidebarTreeEntryWrapper* _tmp1_;
 	SidebarTreeEntryWrapper* _tmp2_;
-	SidebarTreeEntryWrapper* _tmp3_;
 	SidebarRenameableEntry* renameable = NULL;
-	SidebarTreeEntryWrapper* _tmp4_;
-	SidebarEntry* _tmp5_;
+	SidebarTreeEntryWrapper* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarRenameableEntry* _tmp5_;
 	SidebarRenameableEntry* _tmp6_;
-	SidebarRenameableEntry* _tmp7_;
-	SidebarTreeEntryWrapper* _tmp8_;
-	SidebarEntry* _tmp9_;
-	GtkTreeSelection* _tmp10_;
-	GtkTreePath* _tmp11_;
+	SidebarTreeEntryWrapper* _tmp7_;
+	SidebarEntry* _tmp8_;
+	GtkTreeSelection* _tmp9_;
 #line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7078,38 +7000,36 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		result = FALSE;
 #line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7082 "Tree.c"
+#line 7004 "Tree.c"
 	}
 #line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = path;
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
+	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, path);
 #line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp2_;
+	wrapper = _tmp1_;
 #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7100 "Tree.c"
+#line 7020 "Tree.c"
 	}
 #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = wrapper;
+	_tmp3_ = wrapper;
 #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _tmp4_->entry;
+	_tmp4_ = _tmp3_->entry;
 #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp5_) : NULL);
+	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp4_) : NULL);
 #line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	renameable = _tmp6_;
+	renameable = _tmp5_;
 #line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = renameable;
+	_tmp6_ = renameable;
 #line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp7_ == NULL) {
+	if (_tmp6_ == NULL) {
 #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7118,14 +7038,14 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		_g_object_unref0 (wrapper);
 #line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7122 "Tree.c"
+#line 7042 "Tree.c"
 	}
 #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = wrapper;
+	_tmp7_ = wrapper;
 #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = _tmp8_->entry;
+	_tmp8_ = _tmp7_->entry;
 #line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_HEADER)) {
 #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7134,14 +7054,12 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 		_g_object_unref0 (wrapper);
 #line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7138 "Tree.c"
+#line 7058 "Tree.c"
 	}
 #line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
+	_tmp9_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
 #line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = path;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
+	gtk_tree_selection_select_path (_tmp9_, path);
 #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7150,56 +7068,56 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	_g_object_unref0 (wrapper);
 #line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7154 "Tree.c"
+#line 7072 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path) {
+static gboolean
+sidebar_tree_destroy_path (SidebarTree* self,
+                           GtkTreePath* path)
+{
 	gboolean result = FALSE;
 	SidebarTreeEntryWrapper* wrapper = NULL;
-	GtkTreePath* _tmp0_;
+	SidebarTreeEntryWrapper* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-	SidebarTreeEntryWrapper* _tmp2_;
 	SidebarDestroyableEntry* destroyable = NULL;
-	SidebarTreeEntryWrapper* _tmp3_;
-	SidebarEntry* _tmp4_;
+	SidebarTreeEntryWrapper* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarDestroyableEntry* _tmp4_;
 	SidebarDestroyableEntry* _tmp5_;
 	SidebarDestroyableEntry* _tmp6_;
-	SidebarDestroyableEntry* _tmp7_;
 #line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
 #line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
 #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = path;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
+	_tmp0_ = sidebar_tree_get_wrapper_at_path (self, path);
 #line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	wrapper = _tmp1_;
+	wrapper = _tmp0_;
 #line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = wrapper;
+	_tmp1_ = wrapper;
 #line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
 #line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7190 "Tree.c"
+#line 7108 "Tree.c"
 	}
 #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
+	_tmp2_ = wrapper;
 #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = _tmp3_->entry;
+	_tmp3_ = _tmp2_->entry;
 #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp4_) : NULL);
+	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp3_) : NULL);
 #line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	destroyable = _tmp5_;
+	destroyable = _tmp4_;
 #line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = destroyable;
+	_tmp5_ = destroyable;
 #line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp6_ == NULL) {
+	if (_tmp5_ == NULL) {
 #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
 #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7208,12 +7126,12 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 		_g_object_unref0 (wrapper);
 #line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7212 "Tree.c"
+#line 7130 "Tree.c"
 	}
 #line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = destroyable;
+	_tmp6_ = destroyable;
 #line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_destroyable_entry_destroy_source (_tmp7_);
+	sidebar_destroyable_entry_destroy_source (_tmp6_);
 #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
 #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7222,28 +7140,38 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	_g_object_unref0 (wrapper);
 #line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7226 "Tree.c"
+#line 7144 "Tree.c"
 }
 
 
-static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
+static void
+_sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender,
+                                                              gpointer self)
+{
 #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7233 "Tree.c"
+#line 7154 "Tree.c"
 }
 
 
-static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
+static gboolean
+_sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                               GdkEventFocus* event,
+                                                               gpointer self)
+{
 	gboolean result;
 	result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event);
 #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7242 "Tree.c"
+#line 7167 "Tree.c"
 }
 
 
-static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
-	GtkCellEditable* _tmp0_;
+static void
+sidebar_tree_on_editing_started (SidebarTree* self,
+                                 GtkCellEditable* editable,
+                                 const gchar* path)
+{
 #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
 #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7251,41 +7179,38 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
 #line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
 #line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = editable;
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7258 "Tree.c"
-		GtkCellEditable* _tmp1_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (editable, gtk_entry_get_type ())) {
+#line 7184 "Tree.c"
+		GtkEntry* _tmp0_;
+		GtkEntry* _tmp1_;
 		GtkEntry* _tmp2_;
 		GtkEntry* _tmp3_;
-		GtkEntry* _tmp4_;
-		GtkEntry* _tmp5_;
 #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp1_ = editable;
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
+		_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (editable, gtk_entry_get_type (), GtkEntry));
 #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
 #line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		self->priv->text_entry = _tmp2_;
+		self->priv->text_entry = _tmp0_;
 #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = self->priv->text_entry;
+		_tmp1_ = self->priv->text_entry;
 #line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_cell_editable_get_type (), GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0);
 #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = self->priv->text_entry;
+		_tmp2_ = self->priv->text_entry;
 #line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = self->priv->text_entry;
+		_tmp3_ = self->priv->text_entry;
 #line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7284 "Tree.c"
+		g_object_set (_tmp3_, "editable", TRUE, NULL);
+#line 7207 "Tree.c"
 	}
 }
 
 
-static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
+static void
+sidebar_tree_on_editing_canceled (SidebarTree* self)
+{
 	GtkEntry* _tmp0_;
 	GtkEntry* _tmp1_;
 	guint _tmp2_;
@@ -7300,20 +7225,22 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
 #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE);
+	g_signal_parse_name ("editing-done", gtk_cell_editable_get_type (), &_tmp2_, NULL, FALSE);
 #line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_cell_editable_get_type (), GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
 #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
 #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
 #line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 7313 "Tree.c"
+#line 7238 "Tree.c"
 }
 
 
-static void sidebar_tree_on_editing_done (SidebarTree* self) {
+static void
+sidebar_tree_on_editing_done (SidebarTree* self)
+{
 	GtkEntry* _tmp0_;
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GtkTreePath* _tmp1_;
@@ -7340,14 +7267,14 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
 #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp2_);
+	__vala_GtkTreePath_free0 (_tmp2_);
 #line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
 #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
 #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7351 "Tree.c"
+#line 7278 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_;
 		SidebarEntry* _tmp7_;
@@ -7365,7 +7292,7 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 		_tmp9_ = renameable;
 #line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7369 "Tree.c"
+#line 7296 "Tree.c"
 			SidebarRenameableEntry* _tmp10_;
 			GtkEntry* _tmp11_;
 			const gchar* _tmp12_;
@@ -7377,18 +7304,18 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
 #line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7381 "Tree.c"
+#line 7308 "Tree.c"
 		}
 #line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7385 "Tree.c"
+#line 7312 "Tree.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
 #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
+	g_signal_parse_name ("editing-done", gtk_cell_editable_get_type (), &_tmp14_, NULL, FALSE);
 #line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_cell_editable_get_type (), GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
 #line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
 #line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7397,11 +7324,14 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
 #line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7401 "Tree.c"
+#line 7328 "Tree.c"
 }
 
 
-static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
+static gboolean
+sidebar_tree_on_editing_focus_out (SidebarTree* self,
+                                   GdkEventFocus* event)
+{
 	gboolean result = FALSE;
 #line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
@@ -7411,11 +7341,13 @@ static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFo
 	result = FALSE;
 #line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7415 "Tree.c"
+#line 7345 "Tree.c"
 }
 
 
-static void sidebar_tree_on_new_search (SidebarTree* self) {
+static void
+sidebar_tree_on_new_search (SidebarTree* self)
+{
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7430,11 +7362,13 @@ static void sidebar_tree_on_new_search (SidebarTree* self) {
 	saved_search_dialog_show (_tmp1_);
 #line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp1_);
-#line 7434 "Tree.c"
+#line 7366 "Tree.c"
 }
 
 
-static void sidebar_tree_on_new_tag (SidebarTree* self) {
+static void
+sidebar_tree_on_new_tag (SidebarTree* self)
+{
 	NewRootTagCommand* creation_command = NULL;
 	NewRootTagCommand* _tmp0_;
 	CommandManager* _tmp1_;
@@ -7473,11 +7407,18 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7477 "Tree.c"
+#line 7411 "Tree.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure,
+                                              GValue * return_value,
+                                              guint n_param_values,
+                                              const GValue * param_values,
+                                              gpointer invocation_hint,
+                                              gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_BOOLEAN callback;
 	register GCClosure * cc;
@@ -7492,23 +7433,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7496 "Tree.c"
+#line 7437 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7502 "Tree.c"
+#line 7443 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 7508 "Tree.c"
+#line 7449 "Tree.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT callback;
 	register GCClosure * cc;
@@ -7523,29 +7471,31 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7527 "Tree.c"
+#line 7475 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7533 "Tree.c"
+#line 7481 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7539 "Tree.c"
+#line 7487 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_entry_wrapper_construct (GType object_type,
+                                      GtkTreeModel* model,
+                                      SidebarEntry* entry,
+                                      GtkTreePath* path)
+{
 	SidebarTreeEntryWrapper * self = NULL;
 	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
-	GtkTreeModel* _tmp2_;
-	GtkTreePath* _tmp3_;
-	GtkTreeRowReference* _tmp4_;
+	GtkTreeRowReference* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7555,39 +7505,39 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = (SidebarTreeEntryWrapper*) g_object_new (object_type, NULL);
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = entry;
-#line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (entry);
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->entry);
 #line 20 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->entry = _tmp1_;
-#line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = model;
-#line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = path;
+	self->entry = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = gtk_tree_row_reference_new (_tmp2_, _tmp3_);
+	_tmp1_ = gtk_tree_row_reference_new (model, path);
 #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_row_reference_free0 (self->row);
+	__vala_GtkTreeRowReference_free0 (self->row);
 #line 21 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->row = _tmp4_;
+	self->row = _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7578 "Tree.c"
+#line 7522 "Tree.c"
 }
 
 
-static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
+static SidebarTreeEntryWrapper*
+sidebar_tree_entry_wrapper_new (GtkTreeModel* model,
+                                SidebarEntry* entry,
+                                GtkTreePath* path)
+{
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path);
-#line 7585 "Tree.c"
+#line 7533 "Tree.c"
 }
 
 
-static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self) {
+static GtkTreePath*
+sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper* self)
+{
 	GtkTreePath* result = NULL;
-	const GtkTreeRowReference* _tmp0_;
+	GtkTreeRowReference* _tmp0_;
 	GtkTreePath* _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (self), NULL);
@@ -7599,14 +7549,17 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper
 	result = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7603 "Tree.c"
+#line 7553 "Tree.c"
 }
 
 
-static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self, GtkTreeIter* result) {
+static void
+sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
+                                     GtkTreeIter* result)
+{
 	GtkTreeIter iter = {0};
 	gboolean valid = FALSE;
-	const GtkTreeRowReference* _tmp0_;
+	GtkTreeRowReference* _tmp0_;
 	GtkTreeModel* _tmp1_;
 	GtkTreePath* _tmp2_;
 	GtkTreePath* _tmp3_;
@@ -7630,7 +7583,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
 #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
 #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_path_free0 (_tmp3_);
+	__vala_GtkTreePath_free0 (_tmp3_);
 #line 30 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	valid = _tmp6_;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7639,38 +7592,46 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
 	*result = iter;
 #line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return;
-#line 7643 "Tree.c"
+#line 7596 "Tree.c"
 }
 
 
-static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass * klass) {
+static void
+sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass * klass)
+{
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize;
-#line 7652 "Tree.c"
+#line 7607 "Tree.c"
 }
 
 
-static void sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper * self) {
+static void
+sidebar_tree_entry_wrapper_instance_init (SidebarTreeEntryWrapper * self)
+{
 }
 
 
-static void sidebar_tree_entry_wrapper_finalize (GObject * obj) {
+static void
+sidebar_tree_entry_wrapper_finalize (GObject * obj)
+{
 	SidebarTreeEntryWrapper * self;
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->entry);
 #line 17 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_row_reference_free0 (self->row);
+	__vala_GtkTreeRowReference_free0 (self->row);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj);
-#line 7670 "Tree.c"
+#line 7629 "Tree.c"
 }
 
 
-static GType sidebar_tree_entry_wrapper_get_type (void) {
+static GType
+sidebar_tree_entry_wrapper_get_type (void)
+{
 	static volatile gsize sidebar_tree_entry_wrapper_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_tree_entry_wrapper_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeEntryWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_entry_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTreeEntryWrapper), 0, (GInstanceInitFunc) sidebar_tree_entry_wrapper_instance_init, NULL };
@@ -7682,12 +7643,14 @@ static GType sidebar_tree_entry_wrapper_get_type (void) {
 }
 
 
-static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object_type, GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
+static SidebarTreeRootWrapper*
+sidebar_tree_root_wrapper_construct (GType object_type,
+                                     GtkTreeModel* model,
+                                     SidebarEntry* entry,
+                                     GtkTreePath* path,
+                                     gint root_position)
+{
 	SidebarTreeRootWrapper * self = NULL;
-	GtkTreeModel* _tmp0_;
-	SidebarEntry* _tmp1_;
-	GtkTreePath* _tmp2_;
-	gint _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7695,54 +7658,59 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, NULL);
 #line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = model;
-#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = entry;
-#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = path;
-#line 41 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self = (SidebarTreeRootWrapper*) sidebar_tree_entry_wrapper_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 43 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = root_position;
+	self = (SidebarTreeRootWrapper*) sidebar_tree_entry_wrapper_construct (object_type, model, entry, path);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->root_position = _tmp3_;
+	self->root_position = root_position;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7712 "Tree.c"
+#line 7667 "Tree.c"
 }
 
 
-static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
+static SidebarTreeRootWrapper*
+sidebar_tree_root_wrapper_new (GtkTreeModel* model,
+                               SidebarEntry* entry,
+                               GtkTreePath* path,
+                               gint root_position)
+{
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position);
-#line 7719 "Tree.c"
+#line 7679 "Tree.c"
 }
 
 
-static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass * klass) {
+static void
+sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass * klass)
+{
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize;
-#line 7728 "Tree.c"
+#line 7690 "Tree.c"
 }
 
 
-static void sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * self) {
+static void
+sidebar_tree_root_wrapper_instance_init (SidebarTreeRootWrapper * self)
+{
 }
 
 
-static void sidebar_tree_root_wrapper_finalize (GObject * obj) {
+static void
+sidebar_tree_root_wrapper_finalize (GObject * obj)
+{
 	SidebarTreeRootWrapper * self;
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj);
-#line 7742 "Tree.c"
+#line 7708 "Tree.c"
 }
 
 
-static GType sidebar_tree_root_wrapper_get_type (void) {
+static GType
+sidebar_tree_root_wrapper_get_type (void)
+{
 	static volatile gsize sidebar_tree_root_wrapper_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_tree_root_wrapper_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeRootWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_root_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTreeRootWrapper), 0, (GInstanceInitFunc) sidebar_tree_root_wrapper_instance_init, NULL };
@@ -7754,7 +7722,9 @@ static GType sidebar_tree_root_wrapper_get_type (void) {
 }
 
 
-static void sidebar_tree_class_init (SidebarTreeClass * klass) {
+static void
+sidebar_tree_class_init (SidebarTreeClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7789,11 +7759,13 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 	sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL] = g_signal_new ("page-created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL] = g_signal_new ("destroying-page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7793 "Tree.c"
+#line 7763 "Tree.c"
 }
 
 
-static void sidebar_tree_instance_init (SidebarTree * self) {
+static void
+sidebar_tree_instance_init (SidebarTree * self)
+{
 	GtkTreeStore* _tmp0_;
 	GtkBuilder* _tmp1_;
 	GeeHashMap* _tmp2_;
@@ -7836,11 +7808,13 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 	self->priv->internal_drag_source_entry = NULL;
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->old_path_ref = NULL;
-#line 7840 "Tree.c"
+#line 7812 "Tree.c"
 }
 
 
-static void sidebar_tree_finalize (GObject * obj) {
+static void
+sidebar_tree_finalize (GObject * obj)
+{
 	SidebarTree * self;
 	GtkCellRendererText* _tmp0_;
 	guint _tmp1_;
@@ -7877,14 +7851,16 @@ static void sidebar_tree_finalize (GObject * obj) {
 #line 76 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
+	__vala_GtkTreeRowReference_free0 (self->priv->old_path_ref);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj);
-#line 7884 "Tree.c"
+#line 7858 "Tree.c"
 }
 
 
-GType sidebar_tree_get_type (void) {
+GType
+sidebar_tree_get_type (void)
+{
 	static volatile gsize sidebar_tree_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_tree_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarTreeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_tree_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarTree), 0, (GInstanceInitFunc) sidebar_tree_instance_init, NULL };
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index eebbd0d..0940f40 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.36.6, the Vala compiler
+/* common.c generated by valac 0.40.4, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  */
 /* A simple grouping Entry that is only expandable*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -60,6 +61,11 @@ typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
 typedef struct _SidebarGrouping SidebarGrouping;
 typedef struct _SidebarGroupingClass SidebarGroupingClass;
 typedef struct _SidebarGroupingPrivate SidebarGroupingPrivate;
+enum  {
+	SIDEBAR_GROUPING_0_PROPERTY,
+	SIDEBAR_GROUPING_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_grouping_properties[SIDEBAR_GROUPING_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
@@ -106,6 +112,11 @@ typedef struct _SidebarContextableIface SidebarContextableIface;
 typedef struct _SidebarSimplePageEntry SidebarSimplePageEntry;
 typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
 typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
+enum  {
+	SIDEBAR_SIMPLE_PAGE_ENTRY_0_PROPERTY,
+	SIDEBAR_SIMPLE_PAGE_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_simple_page_entry_properties[SIDEBAR_SIMPLE_PAGE_ENTRY_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ())
@@ -129,6 +140,11 @@ typedef struct _SidebarBranchPrivate SidebarBranchPrivate;
 typedef struct _SidebarRootOnlyBranch SidebarRootOnlyBranch;
 typedef struct _SidebarRootOnlyBranchClass SidebarRootOnlyBranchClass;
 typedef struct _SidebarRootOnlyBranchPrivate SidebarRootOnlyBranchPrivate;
+enum  {
+	SIDEBAR_ROOT_ONLY_BRANCH_0_PROPERTY,
+	SIDEBAR_ROOT_ONLY_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_root_only_branch_properties[SIDEBAR_ROOT_ONLY_BRANCH_NUM_PROPERTIES];
 
 #define SIDEBAR_BRANCH_TYPE_OPTIONS (sidebar_branch_options_get_type ())
 
@@ -150,6 +166,11 @@ typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
 typedef struct _SidebarHeader SidebarHeader;
 typedef struct _SidebarHeaderClass SidebarHeaderClass;
 typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
+enum  {
+	SIDEBAR_HEADER_0_PROPERTY,
+	SIDEBAR_HEADER_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_header_properties[SIDEBAR_HEADER_NUM_PROPERTIES];
 
 struct _SidebarEntryIface {
 	GTypeInterface parent_iface;
@@ -284,12 +305,15 @@ GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_GROUPING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_GROUPING, SidebarGroupingPrivate))
-enum  {
-	SIDEBAR_GROUPING_DUMMY_PROPERTY
-};
-SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, const gchar* tooltip);
-SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip);
-static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name);
+SidebarGrouping* sidebar_grouping_new (const gchar* name,
+                                       const gchar* icon,
+                                       const gchar* tooltip);
+SidebarGrouping* sidebar_grouping_construct (GType object_type,
+                                             const gchar* name,
+                                             const gchar* icon,
+                                             const gchar* tooltip);
+static void sidebar_grouping_real_rename (SidebarRenameableEntry* base,
+                                   const gchar* name);
 static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base);
 static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base);
 static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base);
@@ -303,9 +327,6 @@ GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
 GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_SIMPLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryPrivate))
-enum  {
-	SIDEBAR_SIMPLE_PAGE_ENTRY_DUMMY_PROPERTY
-};
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self);
 static gchar* sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self);
@@ -319,111 +340,122 @@ Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self);
 static Page* sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self);
 static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base);
 static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base);
-static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree);
-static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
+static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base,
+                                            SidebarTree* tree);
+static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base,
+                                                                  GdkEventButton* event);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 GtkMenu* page_get_page_context_menu (Page* self);
 static void sidebar_simple_page_entry_finalize (GObject * obj);
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType sidebar_root_only_branch_get_type (void) G_GNUC_CONST;
-enum  {
-	SIDEBAR_ROOT_ONLY_BRANCH_DUMMY_PROPERTY
-};
 SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root);
-SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root);
+SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type,
+                                                           SidebarEntry* root);
 GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a,
+                                               SidebarEntry* b);
+static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a,
+                                                              gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+                                   SidebarBranchOptions options,
+                                   GCompareFunc default_comparator,
+                                   GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+                                         SidebarEntry* root,
+                                         SidebarBranchOptions options,
+                                         GCompareFunc default_comparator,
+                                         GCompareFunc root_comparator);
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_HEADER, SidebarHeaderPrivate))
-enum  {
-	SIDEBAR_HEADER_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+                                   const gchar* tooltip,
+                                   gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+                                         const gchar* name,
+                                         const gchar* tooltip,
+                                         gboolean emphasized);
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base);
 static void sidebar_header_finalize (GObject * obj);
-GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event);
+GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self,
+                                                       GdkEventButton* event);
 
 
-SidebarGrouping* sidebar_grouping_construct (GType object_type, const gchar* name, const gchar* icon, const gchar* tooltip) {
+SidebarGrouping*
+sidebar_grouping_construct (GType object_type,
+                            const gchar* name,
+                            const gchar* icon,
+                            const gchar* tooltip)
+{
 	SidebarGrouping * self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = (SidebarGrouping*) g_object_new (object_type, NULL);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp0_ = name;
-#line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_g_free0 (self->priv->name);
 #line 16 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->name = _tmp1_;
+	self->priv->name = _tmp0_;
 #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp2_ = icon;
-#line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (icon);
 #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_g_free0 (self->priv->icon);
 #line 17 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->icon = _tmp3_;
-#line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp4_ = tooltip;
+	self->priv->icon = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (tooltip);
 #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_g_free0 (self->priv->tooltip);
 #line 18 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->tooltip = _tmp5_;
+	self->priv->tooltip = _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self;
-#line 391 "common.c"
+#line 420 "common.c"
 }
 
 
-SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, const gchar* tooltip) {
+SidebarGrouping*
+sidebar_grouping_new (const gchar* name,
+                      const gchar* icon,
+                      const gchar* tooltip)
+{
 #line 15 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return sidebar_grouping_construct (SIDEBAR_TYPE_GROUPING, name, icon, tooltip);
-#line 398 "common.c"
+#line 431 "common.c"
 }
 
 
-static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name) {
+static void
+sidebar_grouping_real_rename (SidebarRenameableEntry* base,
+                              const gchar* name)
+{
 	SidebarGrouping * self;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
+	gchar* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 21 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_if_fail (name != NULL);
 #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp0_ = name;
-#line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_g_free0 (self->priv->name);
 #line 22 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->name = _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp2_ = name;
+	self->priv->name = _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp2_);
-#line 423 "common.c"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", name);
+#line 453 "common.c"
 }
 
 
-static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base) {
+static gboolean
+sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry* base)
+{
 	SidebarGrouping * self;
 	gboolean result = FALSE;
 #line 26 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -432,11 +464,13 @@ static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry
 	result = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 436 "common.c"
+#line 468 "common.c"
 }
 
 
-static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
+static gchar*
+sidebar_grouping_real_get_sidebar_name (SidebarEntry* base)
+{
 	SidebarGrouping * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -451,11 +485,13 @@ static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
 	result = _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 455 "common.c"
+#line 489 "common.c"
 }
 
 
-static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
+static gchar*
+sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base)
+{
 	SidebarGrouping * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -470,11 +506,13 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
 	result = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 474 "common.c"
+#line 510 "common.c"
 }
 
 
-static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
+static gchar*
+sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base)
+{
 	SidebarGrouping * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -489,11 +527,13 @@ static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
 	result = _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 493 "common.c"
+#line 531 "common.c"
 }
 
 
-static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) {
+static gchar*
+sidebar_grouping_real_to_string (SidebarEntry* base)
+{
 	SidebarGrouping * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -508,11 +548,13 @@ static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) {
 	result = _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 512 "common.c"
+#line 552 "common.c"
 }
 
 
-static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base) {
+static gboolean
+sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base)
+{
 	SidebarGrouping * self;
 	gboolean result = FALSE;
 #line 46 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -521,22 +563,26 @@ static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry*
 	result = TRUE;
 #line 47 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 525 "common.c"
+#line 567 "common.c"
 }
 
 
-static void sidebar_grouping_class_init (SidebarGroupingClass * klass) {
+static void
+sidebar_grouping_class_init (SidebarGroupingClass * klass)
+{
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_type_class_add_private (klass, sizeof (SidebarGroupingPrivate));
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_grouping_finalize;
-#line 536 "common.c"
+#line 580 "common.c"
 }
 
 
-static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * iface) {
+static void
+sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * iface)
+{
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -547,38 +593,46 @@ static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * i
 	iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_icon;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_to_string;
-#line 551 "common.c"
+#line 597 "common.c"
 }
 
 
-static void sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
+static void
+sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface)
+{
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) sidebar_grouping_real_expand_on_select;
-#line 560 "common.c"
+#line 608 "common.c"
 }
 
 
-static void sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
+static void
+sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface)
+{
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_grouping_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) sidebar_grouping_real_rename;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) sidebar_grouping_real_is_user_renameable;
-#line 571 "common.c"
+#line 621 "common.c"
 }
 
 
-static void sidebar_grouping_instance_init (SidebarGrouping * self) {
+static void
+sidebar_grouping_instance_init (SidebarGrouping * self)
+{
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv = SIDEBAR_GROUPING_GET_PRIVATE (self);
-#line 578 "common.c"
+#line 630 "common.c"
 }
 
 
-static void sidebar_grouping_finalize (GObject * obj) {
+static void
+sidebar_grouping_finalize (GObject * obj)
+{
 	SidebarGrouping * self;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
@@ -590,11 +644,13 @@ static void sidebar_grouping_finalize (GObject * obj) {
 	_g_free0 (self->priv->icon);
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (sidebar_grouping_parent_class)->finalize (obj);
-#line 594 "common.c"
+#line 648 "common.c"
 }
 
 
-GType sidebar_grouping_get_type (void) {
+GType
+sidebar_grouping_get_type (void)
+{
 	static volatile gsize sidebar_grouping_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_grouping_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarGroupingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_grouping_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarGrouping), 0, (GInstanceInitFunc) sidebar_grouping_instance_init, NULL };
@@ -612,35 +668,43 @@ GType sidebar_grouping_get_type (void) {
 }
 
 
-SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type) {
+SidebarSimplePageEntry*
+sidebar_simple_page_entry_construct (GType object_type)
+{
 	SidebarSimplePageEntry * self = NULL;
 #line 58 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = (SidebarSimplePageEntry*) g_object_new (object_type, NULL);
 #line 58 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self;
-#line 622 "common.c"
+#line 680 "common.c"
 }
 
 
-static gchar* sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self) {
+static gchar*
+sidebar_simple_page_entry_real_get_sidebar_name (SidebarSimplePageEntry* self)
+{
 #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_get_sidebar_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return NULL;
-#line 631 "common.c"
+#line 691 "common.c"
 }
 
 
-gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self) {
+gchar*
+sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self)
+{
 #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL);
 #line 61 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_name (self);
-#line 640 "common.c"
+#line 702 "common.c"
 }
 
 
-static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) {
+static gchar*
+sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -649,38 +713,46 @@ static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimpleP
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 653 "common.c"
+#line 717 "common.c"
 }
 
 
-gchar* sidebar_simple_page_entry_get_sidebar_tooltip (SidebarSimplePageEntry* self) {
+gchar*
+sidebar_simple_page_entry_get_sidebar_tooltip (SidebarSimplePageEntry* self)
+{
 #line 63 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL);
 #line 63 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_tooltip (self);
-#line 662 "common.c"
+#line 728 "common.c"
 }
 
 
-static gchar* sidebar_simple_page_entry_real_get_sidebar_icon (SidebarSimplePageEntry* self) {
+static gchar*
+sidebar_simple_page_entry_real_get_sidebar_icon (SidebarSimplePageEntry* self)
+{
 #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_get_sidebar_icon'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return NULL;
-#line 671 "common.c"
+#line 739 "common.c"
 }
 
 
-gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self) {
+gchar*
+sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self)
+{
 #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL);
 #line 67 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->get_sidebar_icon (self);
-#line 680 "common.c"
+#line 750 "common.c"
 }
 
 
-static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) {
+static gchar*
+sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -689,38 +761,46 @@ static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry*
 	result = _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 693 "common.c"
+#line 765 "common.c"
 }
 
 
-gchar* sidebar_simple_page_entry_to_string (SidebarSimplePageEntry* self) {
+gchar*
+sidebar_simple_page_entry_to_string (SidebarSimplePageEntry* self)
+{
 #line 69 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL);
 #line 69 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->to_string (self);
-#line 702 "common.c"
+#line 776 "common.c"
 }
 
 
-static Page* sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self) {
+static Page*
+sidebar_simple_page_entry_real_create_page (SidebarSimplePageEntry* self)
+{
 #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_critical ("Type `%s' does not implement abstract method `sidebar_simple_page_entry_create_page'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return NULL;
-#line 711 "common.c"
+#line 787 "common.c"
 }
 
 
-Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) {
+Page*
+sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self)
+{
 #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_SIMPLE_PAGE_ENTRY (self), NULL);
 #line 73 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS (self)->create_page (self);
-#line 720 "common.c"
+#line 798 "common.c"
 }
 
 
-static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) {
+static gboolean
+sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base)
+{
 	SidebarSimplePageEntry * self;
 	gboolean result = FALSE;
 	Page* _tmp0_;
@@ -732,18 +812,22 @@ static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentati
 	result = _tmp0_ != NULL;
 #line 76 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 736 "common.c"
+#line 816 "common.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 743 "common.c"
+#line 825 "common.c"
 }
 
 
-static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) {
+static Page*
+sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base)
+{
 	SidebarSimplePageEntry * self;
 	Page* result = NULL;
 	Page* _tmp0_;
@@ -755,7 +839,7 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 	_tmp0_ = self->priv->page;
 #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	if (_tmp0_ == NULL) {
-#line 759 "common.c"
+#line 843 "common.c"
 		Page* _tmp1_;
 		Page* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -768,7 +852,7 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 		_tmp2_ = self->priv->page;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative), "page-created", _tmp2_);
-#line 772 "common.c"
+#line 856 "common.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp3_ = self->priv->page;
@@ -778,11 +862,14 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 	result = _tmp4_;
 #line 85 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 782 "common.c"
+#line 866 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree) {
+static void
+sidebar_simple_page_entry_real_pruned (SidebarEntry* base,
+                                       SidebarTree* tree)
+{
 	SidebarSimplePageEntry * self;
 	Page* _tmp0_;
 	Page* _tmp1_;
@@ -797,7 +884,7 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 	if (_tmp0_ == NULL) {
 #line 90 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		return;
-#line 801 "common.c"
+#line 888 "common.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp1_ = self->priv->page;
@@ -811,11 +898,14 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 	_g_object_unref0 (self->priv->page);
 #line 94 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv->page = NULL;
-#line 815 "common.c"
+#line 902 "common.c"
 }
 
 
-static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
+static GtkMenu*
+sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base,
+                                                         GdkEventButton* event)
+{
 	SidebarSimplePageEntry * self;
 	GtkMenu* result = NULL;
 	Page* _tmp0_;
@@ -838,11 +928,13 @@ static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (Sidebar
 	result = _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 842 "common.c"
+#line 932 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * klass) {
+static void
+sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass * klass)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_parent_class = g_type_class_peek_parent (klass);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -859,11 +951,13 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass *
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_create_page;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_simple_page_entry_finalize;
-#line 863 "common.c"
+#line 955 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntryIface * iface) {
+static void
+sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntryIface * iface)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -876,47 +970,57 @@ static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntry
 	iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_to_string;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->pruned = (void (*) (SidebarEntry *, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
-#line 880 "common.c"
+#line 974 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_sidebar_selectable_entry_interface_init (SidebarSelectableEntryIface * iface) {
+static void
+sidebar_simple_page_entry_sidebar_selectable_entry_interface_init (SidebarSelectableEntryIface * iface)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 887 "common.c"
+#line 983 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_sidebar_page_representative_interface_init (SidebarPageRepresentativeIface * iface) {
+static void
+sidebar_simple_page_entry_sidebar_page_representative_interface_init (SidebarPageRepresentativeIface * iface)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_page_representative_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->has_page = (gboolean (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_has_page;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->get_page = (Page* (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_get_page;
-#line 898 "common.c"
+#line 996 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
+static void
+sidebar_simple_page_entry_sidebar_contextable_interface_init (SidebarContextableIface * iface)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_simple_page_entry_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
-#line 907 "common.c"
+#line 1007 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * self) {
+static void
+sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * self)
+{
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv = SIDEBAR_SIMPLE_PAGE_ENTRY_GET_PRIVATE (self);
 #line 56 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv->page = NULL;
-#line 916 "common.c"
+#line 1018 "common.c"
 }
 
 
-static void sidebar_simple_page_entry_finalize (GObject * obj) {
+static void
+sidebar_simple_page_entry_finalize (GObject * obj)
+{
 	SidebarSimplePageEntry * self;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
@@ -924,11 +1028,13 @@ static void sidebar_simple_page_entry_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->page);
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (sidebar_simple_page_entry_parent_class)->finalize (obj);
-#line 928 "common.c"
+#line 1032 "common.c"
 }
 
 
-GType sidebar_simple_page_entry_get_type (void) {
+GType
+sidebar_simple_page_entry_get_type (void)
+{
 	static volatile gsize sidebar_simple_page_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_simple_page_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarSimplePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_simple_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarSimplePageEntry), 0, (GInstanceInitFunc) sidebar_simple_page_entry_instance_init, NULL };
@@ -948,80 +1054,88 @@ GType sidebar_simple_page_entry_get_type (void) {
 }
 
 
-static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_sidebar_root_only_branch_null_comparator_gcompare_func (gconstpointer a,
+                                                         gconstpointer b)
+{
 	gint result;
 	result = sidebar_root_only_branch_null_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 957 "common.c"
+#line 1066 "common.c"
 }
 
 
-SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root) {
+SidebarRootOnlyBranch*
+sidebar_root_only_branch_construct (GType object_type,
+                                    SidebarEntry* root)
+{
 	SidebarRootOnlyBranch * self = NULL;
-	SidebarEntry* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
 #line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp0_ = root;
-#line 105 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self = (SidebarRootOnlyBranch*) sidebar_branch_construct (object_type, _tmp0_, SIDEBAR_BRANCH_OPTIONS_NONE, _sidebar_root_only_branch_null_comparator_gcompare_func, NULL);
+	self = (SidebarRootOnlyBranch*) sidebar_branch_construct (object_type, root, SIDEBAR_BRANCH_OPTIONS_NONE, _sidebar_root_only_branch_null_comparator_gcompare_func, NULL);
 #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self;
-#line 972 "common.c"
+#line 1081 "common.c"
 }
 
 
-SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root) {
+SidebarRootOnlyBranch*
+sidebar_root_only_branch_new (SidebarEntry* root)
+{
 #line 104 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return sidebar_root_only_branch_construct (SIDEBAR_TYPE_ROOT_ONLY_BRANCH, root);
-#line 979 "common.c"
+#line 1090 "common.c"
 }
 
 
-static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+sidebar_root_only_branch_null_comparator (SidebarEntry* a,
+                                          SidebarEntry* b)
+{
 	gint result = 0;
 	gint _tmp0_ = 0;
-	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
 #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 108 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
 #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp1_ = a;
-#line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp2_ = b;
-#line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	if (_tmp1_ != _tmp2_) {
+	if (a != b) {
 #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		_tmp0_ = -1;
-#line 1000 "common.c"
+#line 1108 "common.c"
 	} else {
 #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		_tmp0_ = 0;
-#line 1004 "common.c"
+#line 1112 "common.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	result = _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 1010 "common.c"
+#line 1118 "common.c"
 }
 
 
-static void sidebar_root_only_branch_class_init (SidebarRootOnlyBranchClass * klass) {
+static void
+sidebar_root_only_branch_class_init (SidebarRootOnlyBranchClass * klass)
+{
 #line 103 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_root_only_branch_parent_class = g_type_class_peek_parent (klass);
-#line 1017 "common.c"
+#line 1127 "common.c"
 }
 
 
-static void sidebar_root_only_branch_instance_init (SidebarRootOnlyBranch * self) {
+static void
+sidebar_root_only_branch_instance_init (SidebarRootOnlyBranch * self)
+{
 }
 
 
-GType sidebar_root_only_branch_get_type (void) {
+GType
+sidebar_root_only_branch_get_type (void)
+{
 	static volatile gsize sidebar_root_only_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_root_only_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarRootOnlyBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_root_only_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarRootOnlyBranch), 0, (GInstanceInitFunc) sidebar_root_only_branch_instance_init, NULL };
@@ -1033,37 +1147,39 @@ GType sidebar_root_only_branch_get_type (void) {
 }
 
 
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized) {
+SidebarHeader*
+sidebar_header_construct (GType object_type,
+                          const gchar* name,
+                          const gchar* tooltip,
+                          gboolean emphasized)
+{
 	SidebarHeader * self = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp0_ = name;
-#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp1_ = tooltip;
-#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, _tmp1_);
+	self = (SidebarHeader*) sidebar_grouping_construct (object_type, name, NULL, tooltip);
 #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp2_ = emphasized;
-#line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->emphasized = _tmp2_;
+	self->priv->emphasized = emphasized;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self;
-#line 1056 "common.c"
+#line 1166 "common.c"
 }
 
 
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized) {
+SidebarHeader*
+sidebar_header_new (const gchar* name,
+                    const gchar* tooltip,
+                    gboolean emphasized)
+{
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, tooltip, emphasized);
-#line 1063 "common.c"
+#line 1177 "common.c"
 }
 
 
-static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) {
+static gboolean
+sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base)
+{
 	SidebarHeader * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -1075,44 +1191,52 @@ static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* bas
 	result = _tmp0_;
 #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 1079 "common.c"
+#line 1195 "common.c"
 }
 
 
-static void sidebar_header_class_init (SidebarHeaderClass * klass) {
+static void
+sidebar_header_class_init (SidebarHeaderClass * klass)
+{
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_header_parent_class = g_type_class_peek_parent (klass);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_type_class_add_private (klass, sizeof (SidebarHeaderPrivate));
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_header_finalize;
-#line 1090 "common.c"
+#line 1208 "common.c"
 }
 
 
-static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmphasizableEntryIface * iface) {
+static void
+sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmphasizableEntryIface * iface)
+{
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	sidebar_header_sidebar_emphasizable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized;
-#line 1099 "common.c"
+#line 1219 "common.c"
 }
 
 
-static void sidebar_header_instance_init (SidebarHeader * self) {
+static void
+sidebar_header_instance_init (SidebarHeader * self)
+{
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv = SIDEBAR_HEADER_GET_PRIVATE (self);
-#line 1106 "common.c"
+#line 1228 "common.c"
 }
 
 
-static void sidebar_header_finalize (GObject * obj) {
+static void
+sidebar_header_finalize (GObject * obj)
+{
 	SidebarHeader * self;
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (sidebar_header_parent_class)->finalize (obj);
-#line 1116 "common.c"
+#line 1240 "common.c"
 }
 
 
@@ -1123,7 +1247,9 @@ static void sidebar_header_finalize (GObject * obj) {
  * using a custom cell_data_function (@see Sidebar.Tree::icon_renderer_function) which ensures that
  * header icons won't be rendered. This approach avoids the blank icon spacing issues.
  */
-GType sidebar_header_get_type (void) {
+GType
+sidebar_header_get_type (void)
+{
 	static volatile gsize sidebar_header_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_header_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarHeader), 0, (GInstanceInitFunc) sidebar_header_instance_init, NULL };
@@ -1137,28 +1263,35 @@ GType sidebar_header_get_type (void) {
 }
 
 
-GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event) {
+GtkMenu*
+sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self,
+                                              GdkEventButton* event)
+{
 #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (SIDEBAR_IS_CONTEXTABLE (self), NULL);
 #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_CONTEXTABLE_GET_INTERFACE (self)->get_sidebar_context_menu (self, event);
-#line 1146 "common.c"
+#line 1275 "common.c"
 }
 
 
-static void sidebar_contextable_base_init (SidebarContextableIface * iface) {
+static void
+sidebar_contextable_base_init (SidebarContextableIface * iface)
+{
 #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	static gboolean initialized = FALSE;
 #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	if (!initialized) {
 #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		initialized = TRUE;
-#line 1157 "common.c"
+#line 1288 "common.c"
 	}
 }
 
 
-GType sidebar_contextable_get_type (void) {
+GType
+sidebar_contextable_get_type (void)
+{
 	static volatile gsize sidebar_contextable_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_contextable_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarContextableIface), (GBaseInitFunc) sidebar_contextable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-06-25 20:55:59 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-06-25 20:55:59 +0200
commit	ab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch)
tree	64961342a79003ee865b3f9f8f41f99f09f37a2e /src/sidebar
parent	49120f48474fc8fdc2448c75d961bc238213cfac (diff)