Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

1 files changed, 323 insertions, 190 deletions

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 };