New upstream version 0.26.4upstream/0.26.4

1 files changed, 74 insertions, 74 deletions

diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 4a8f7f4..4b46c50 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.34.7, the Vala compiler
+/* common.c generated by valac 0.36.6, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -266,17 +266,17 @@ struct _SidebarHeaderPrivate {
 
 
 static gpointer sidebar_grouping_parent_class = NULL;
-static SidebarEntryIface* sidebar_grouping_sidebar_entry_parent_iface = NULL;
-static SidebarExpandableEntryIface* sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
-static SidebarRenameableEntryIface* sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarEntryIface * sidebar_grouping_sidebar_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * sidebar_grouping_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * sidebar_grouping_sidebar_renameable_entry_parent_iface = NULL;
 static gpointer sidebar_simple_page_entry_parent_class = NULL;
-static SidebarEntryIface* sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
-static SidebarSelectableEntryIface* sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
-static SidebarPageRepresentativeIface* sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
-static SidebarContextableIface* sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
+static SidebarEntryIface * sidebar_simple_page_entry_sidebar_entry_parent_iface = NULL;
+static SidebarSelectableEntryIface * sidebar_simple_page_entry_sidebar_selectable_entry_parent_iface = NULL;
+static SidebarPageRepresentativeIface * sidebar_simple_page_entry_sidebar_page_representative_parent_iface = NULL;
+static SidebarContextableIface * sidebar_simple_page_entry_sidebar_contextable_parent_iface = NULL;
 static gpointer sidebar_root_only_branch_parent_class = NULL;
 static gpointer sidebar_header_parent_class = NULL;
-static SidebarEmphasizableEntryIface* sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
+static SidebarEmphasizableEntryIface * sidebar_header_sidebar_emphasizable_entry_parent_iface = NULL;
 
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
@@ -296,7 +296,7 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base);
 static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base);
 static gchar* sidebar_grouping_real_to_string (SidebarEntry* base);
 static gboolean sidebar_grouping_real_expand_on_select (SidebarExpandableEntry* base);
-static void sidebar_grouping_finalize (GObject* obj);
+static void sidebar_grouping_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -323,7 +323,7 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 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);
+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  {
@@ -345,18 +345,18 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base);
-static void sidebar_header_finalize (GObject* obj);
+static void sidebar_header_finalize (GObject * obj);
 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 * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #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"
@@ -400,9 +400,9 @@ SidebarGrouping* sidebar_grouping_new (const gchar* name, const gchar* icon, con
 
 static void sidebar_grouping_real_rename (SidebarRenameableEntry* base, const gchar* name) {
 	SidebarGrouping * self;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
 #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"
@@ -439,8 +439,8 @@ static gboolean sidebar_grouping_real_is_user_renameable (SidebarRenameableEntry
 static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 31 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -458,8 +458,8 @@ static gchar* sidebar_grouping_real_get_sidebar_name (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -477,8 +477,8 @@ static gchar* sidebar_grouping_real_get_sidebar_tooltip (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 38 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 39 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -496,8 +496,8 @@ static gchar* sidebar_grouping_real_get_sidebar_icon (SidebarEntry* base) {
 static gchar* sidebar_grouping_real_to_string (SidebarEntry* base) {
 	SidebarGrouping * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 42 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_GROUPING, SidebarGrouping);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -540,13 +540,13 @@ static void sidebar_grouping_sidebar_entry_interface_init (SidebarEntryIface * i
 #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"
-	iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_name;
+	iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_name;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_tooltip;
+	iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_get_sidebar_tooltip;
 #line 8 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_grouping_real_get_sidebar_icon;
+	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;
+	iface->to_string = (gchar* (*) (SidebarEntry *)) sidebar_grouping_real_to_string;
 #line 551 "common.c"
 }
 
@@ -555,7 +555,7 @@ static void sidebar_grouping_sidebar_expandable_entry_interface_init (SidebarExp
 #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;
+	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) sidebar_grouping_real_expand_on_select;
 #line 560 "common.c"
 }
 
@@ -564,9 +564,9 @@ static void sidebar_grouping_sidebar_renameable_entry_interface_init (SidebarRen
 #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;
+	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;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) sidebar_grouping_real_is_user_renameable;
 #line 571 "common.c"
 }
 
@@ -578,7 +578,7 @@ static void sidebar_grouping_instance_init (SidebarGrouping * self) {
 }
 
 
-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);
@@ -642,7 +642,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self)
 
 static gchar* sidebar_simple_page_entry_real_get_sidebar_tooltip (SidebarSimplePageEntry* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
 #line 64 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -682,7 +682,7 @@ gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self)
 
 static gchar* sidebar_simple_page_entry_real_to_string (SidebarSimplePageEntry* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp0_ = sidebar_simple_page_entry_get_sidebar_name (self);
 #line 70 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -723,7 +723,7 @@ Page* sidebar_simple_page_entry_create_page (SidebarSimplePageEntry* self) {
 static gboolean sidebar_simple_page_entry_real_has_page (SidebarPageRepresentative* base) {
 	SidebarSimplePageEntry * self;
 	gboolean result = FALSE;
-	Page* _tmp0_ = NULL;
+	Page* _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 76 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -746,9 +746,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative* base) {
 	SidebarSimplePageEntry * self;
 	Page* result = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp3_ = NULL;
-	Page* _tmp4_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp3_;
+	Page* _tmp4_;
 #line 79 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -756,8 +756,8 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 #line 80 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	if (_tmp0_ == NULL) {
 #line 759 "common.c"
-		Page* _tmp1_ = NULL;
-		Page* _tmp2_ = NULL;
+		Page* _tmp1_;
+		Page* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		_tmp1_ = sidebar_simple_page_entry_create_page (self);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -784,9 +784,9 @@ static Page* sidebar_simple_page_entry_real_get_page (SidebarPageRepresentative*
 
 static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTree* tree) {
 	SidebarSimplePageEntry * self;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
 #line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 88 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -818,10 +818,10 @@ static void sidebar_simple_page_entry_real_pruned (SidebarEntry* base, SidebarTr
 static GtkMenu* sidebar_simple_page_entry_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
 	SidebarSimplePageEntry * self;
 	GtkMenu* result = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GtkMenu* _tmp2_ = NULL;
-	GtkMenu* _tmp3_ = NULL;
+	Page* _tmp0_;
+	Page* _tmp1_;
+	GtkMenu* _tmp2_;
+	GtkMenu* _tmp3_;
 #line 97 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry);
 #line 98 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -848,15 +848,15 @@ static void sidebar_simple_page_entry_class_init (SidebarSimplePageEntryClass *
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_type_class_add_private (klass, sizeof (SidebarSimplePageEntryPrivate));
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_name;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_tooltip = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_tooltip;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_get_sidebar_icon;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_to_string;
+	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) sidebar_simple_page_entry_real_to_string;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) sidebar_simple_page_entry_real_create_page;
+	((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"
@@ -867,15 +867,15 @@ static void sidebar_simple_page_entry_sidebar_entry_interface_init (SidebarEntry
 #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"
-	iface->get_sidebar_name = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_name;
+	iface->get_sidebar_name = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_name;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_tooltip = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_tooltip;
+	iface->get_sidebar_tooltip = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_tooltip;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->get_sidebar_icon = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_get_sidebar_icon;
+	iface->get_sidebar_icon = (gchar* (*) (SidebarEntry *)) sidebar_simple_page_entry_get_sidebar_icon;
 #line 54 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	iface->to_string = (gchar* (*)(SidebarEntry*)) sidebar_simple_page_entry_to_string;
+	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;
+	iface->pruned = (void (*) (SidebarEntry *, SidebarTree*)) sidebar_simple_page_entry_real_pruned;
 #line 880 "common.c"
 }
 
@@ -891,9 +891,9 @@ static void sidebar_simple_page_entry_sidebar_page_representative_interface_init
 #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;
+	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;
+	iface->get_page = (Page* (*) (SidebarPageRepresentative *)) sidebar_simple_page_entry_real_get_page;
 #line 898 "common.c"
 }
 
@@ -902,7 +902,7 @@ static void sidebar_simple_page_entry_sidebar_contextable_interface_init (Sideba
 #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;
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) sidebar_simple_page_entry_real_get_sidebar_context_menu;
 #line 907 "common.c"
 }
 
@@ -916,7 +916,7 @@ static void sidebar_simple_page_entry_instance_init (SidebarSimplePageEntry * se
 }
 
 
-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);
@@ -959,7 +959,7 @@ static gint _sidebar_root_only_branch_null_comparator_gcompare_func (gconstpoint
 
 SidebarRootOnlyBranch* sidebar_root_only_branch_construct (GType object_type, SidebarEntry* root) {
 	SidebarRootOnlyBranch * self = NULL;
-	SidebarEntry* _tmp0_ = 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"
@@ -982,8 +982,8 @@ SidebarRootOnlyBranch* sidebar_root_only_branch_new (SidebarEntry* root) {
 static gint sidebar_root_only_branch_null_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
+	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"
@@ -1035,8 +1035,8 @@ GType sidebar_root_only_branch_get_type (void) {
 
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized) {
 	SidebarHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
 #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"
@@ -1063,7 +1063,7 @@ SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized) {
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base) {
 	SidebarHeader * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_HEADER, SidebarHeader);
 #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala"
@@ -1091,7 +1091,7 @@ static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmp
 #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;
+	iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized;
 #line 1096 "common.c"
 }
 
@@ -1103,7 +1103,7 @@ static void sidebar_header_instance_init (SidebarHeader * self) {
 }
 
 
-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);