Merge branch 'feature/upstream' into develop

1 files changed, 153 insertions, 156 deletions

diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 2da9433..a1664ff 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -479,12 +479,12 @@ struct _SearchesSidebarEntryPrivate {
 
 static gpointer searches_branch_parent_class = NULL;
 static gpointer searches_header_parent_class = NULL;
-static SidebarContextableIface* searches_header_sidebar_contextable_parent_iface = NULL;
+static SidebarContextableIface * searches_header_sidebar_contextable_parent_iface = NULL;
 static gpointer searches_sidebar_entry_parent_class = NULL;
 static gchar* searches_sidebar_entry_single_search_icon;
 static gchar* searches_sidebar_entry_single_search_icon = NULL;
-static SidebarRenameableEntryIface* searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarDestroyableEntryIface* searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarDestroyableEntryIface * searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
 
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 GType searches_branch_get_type (void) G_GNUC_CONST;
@@ -532,7 +532,7 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void searches_branch_finalize (GObject* obj);
+static void searches_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -556,7 +556,7 @@ GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
 static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-static void searches_header_finalize (GObject* obj);
+static void searches_header_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;
@@ -602,7 +602,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search);
 DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search);
 GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
-static void searches_sidebar_entry_finalize (GObject* obj);
+static void searches_sidebar_entry_finalize (GObject * obj);
 
 
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
@@ -630,12 +630,12 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo
 
 SearchesBranch* searches_branch_construct (GType object_type) {
 	SearchesBranch * self = NULL;
-	SearchesHeader* _tmp0_ = NULL;
-	SearchesHeader* _tmp1_ = NULL;
-	SavedSearchTable* _tmp13_ = NULL;
-	SavedSearchTable* _tmp14_ = NULL;
-	SavedSearchTable* _tmp15_ = NULL;
-	SavedSearchTable* _tmp16_ = NULL;
+	SearchesHeader* _tmp0_;
+	SearchesHeader* _tmp1_;
+	SavedSearchTable* _tmp13_;
+	SavedSearchTable* _tmp14_;
+	SavedSearchTable* _tmp15_;
+	SavedSearchTable* _tmp16_;
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = searches_header_new ();
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -647,12 +647,12 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 #line 648 "Branch.c"
 	{
 		GeeIterator* _search_it = NULL;
-		SavedSearchTable* _tmp2_ = NULL;
-		SavedSearchTable* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
-		GeeIterator* _tmp7_ = NULL;
+		SavedSearchTable* _tmp2_;
+		SavedSearchTable* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = saved_search_table_get_instance ();
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -674,12 +674,12 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		while (TRUE) {
 #line 677 "Branch.c"
-			GeeIterator* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
 			SavedSearch* search = NULL;
-			GeeIterator* _tmp10_ = NULL;
-			gpointer _tmp11_ = NULL;
-			SavedSearch* _tmp12_ = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			SavedSearch* _tmp12_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp8_ = _search_it;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -739,9 +739,9 @@ SearchesBranch* searches_branch_new (void) {
 
 SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -762,13 +762,13 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 
 static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	SidebarEntry* _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SavedSearch* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SavedSearch* _tmp5_;
+	gint _tmp6_;
 #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -805,12 +805,12 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 
 static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SearchesSidebarEntry* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	SavedSearch* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
-	SidebarEntry* _tmp5_ = NULL;
+	SavedSearch* _tmp0_;
+	SearchesSidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -845,13 +845,13 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 
 static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) {
 	SearchesSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
 	gboolean is_removed = FALSE;
-	GeeHashMap* _tmp3_ = NULL;
-	SavedSearch* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GeeHashMap* _tmp3_;
+	SavedSearch* _tmp4_;
+	gboolean _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -898,7 +898,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) {
 
 
 static void searches_branch_instance_init (SearchesBranch * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -909,14 +909,14 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 }
 
 
-static void searches_branch_finalize (GObject* obj) {
+static void searches_branch_finalize (GObject * obj) {
 	SearchesBranch * self;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	SavedSearchTable* _tmp3_ = NULL;
-	SavedSearchTable* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	guint _tmp2_;
+	SavedSearchTable* _tmp3_;
+	SavedSearchTable* _tmp4_;
+	guint _tmp5_;
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch);
 #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -961,35 +961,32 @@ GType searches_branch_get_type (void) {
 
 SearchesHeader* searches_header_construct (GType object_type) {
 	SearchesHeader * self = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = _ ("Saved Searches");
-#line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), TRUE);
 #line 69 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 974 "Branch.c"
+#line 971 "Branch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 981 "Branch.c"
+#line 978 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 988 "Branch.c"
+#line 985 "Branch.c"
 }
 
 
 static void searches_header_setup_context_menu (SearchesHeader* self) {
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_HEADER (self));
@@ -999,17 +996,17 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1003 "Branch.c"
+#line 1000 "Branch.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GMenuModel* _tmp6_ = NULL;
-		GMenuModel* _tmp7_ = NULL;
-		GtkMenu* _tmp8_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GMenuModel* _tmp6_;
+		GMenuModel* _tmp7_;
+		GtkMenu* _tmp8_;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1022,8 +1019,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_free0 (_tmp3_);
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1026 "Branch.c"
-			goto __catch76_g_error;
+#line 1023 "Branch.c"
+			goto __catch77_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp4_ = self->priv->builder;
@@ -1045,18 +1042,18 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		self->priv->context_menu = _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (model);
-#line 1049 "Branch.c"
+#line 1046 "Branch.c"
 	}
-	goto __finally76;
-	__catch76_g_error:
+	goto __finally77;
+	__catch77_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		Application* _tmp13_ = NULL;
-		Application* _tmp14_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		Application* _tmp13_;
+		Application* _tmp14_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_error_ = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1083,9 +1080,9 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_application_unref0 (_tmp14_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1087 "Branch.c"
+#line 1084 "Branch.c"
 	}
-	__finally76:
+	__finally77:
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1094,7 +1091,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return;
-#line 1098 "Branch.c"
+#line 1095 "Branch.c"
 	}
 }
 
@@ -1102,8 +1099,8 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
 	SearchesHeader * self;
 	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
 #line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
 #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1114,7 +1111,7 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	result = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1118 "Branch.c"
+#line 1115 "Branch.c"
 }
 
 
@@ -1125,7 +1122,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1129 "Branch.c"
+#line 1126 "Branch.c"
 }
 
 
@@ -1133,8 +1130,8 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1138 "Branch.c"
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
+#line 1135 "Branch.c"
 }
 
 
@@ -1143,11 +1140,11 @@ static void searches_header_instance_init (SearchesHeader * self) {
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 1147 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
-static void searches_header_finalize (GObject* obj) {
+static void searches_header_finalize (GObject * obj) {
 	SearchesHeader * self;
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
@@ -1157,7 +1154,7 @@ static void searches_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1161 "Branch.c"
+#line 1158 "Branch.c"
 }
 
 
@@ -1177,8 +1174,8 @@ GType searches_header_get_type (void) {
 
 SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) {
 	SearchesSidebarEntry * self = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1193,14 +1190,14 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	self->priv->search = _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 1197 "Branch.c"
+#line 1194 "Branch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
 #line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1204 "Branch.c"
+#line 1201 "Branch.c"
 }
 
 
@@ -1214,8 +1211,8 @@ void searches_sidebar_entry_terminate (void) {
 
 SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) {
 	SavedSearch* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearch* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
 #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1226,15 +1223,15 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	result = _tmp1_;
 #line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1230 "Branch.c"
+#line 1227 "Branch.c"
 }
 
 
 static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1245,15 +1242,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1249 "Branch.c"
+#line 1246 "Branch.c"
 }
 
 
 static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1264,15 +1261,15 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1268 "Branch.c"
+#line 1265 "Branch.c"
 }
 
 
 static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
 	SearchesSidebarEntry * self;
 	Page* result = NULL;
-	SavedSearch* _tmp0_ = NULL;
-	SavedSearchPage* _tmp1_ = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearchPage* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1285,7 +1282,7 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1289 "Branch.c"
+#line 1286 "Branch.c"
 }
 
 
@@ -1298,17 +1295,17 @@ static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameabl
 	result = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1302 "Branch.c"
+#line 1299 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
 	SearchesSidebarEntry * self;
-	SavedSearchTable* _tmp0_ = NULL;
-	SavedSearchTable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1327,13 +1324,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	_saved_search_table_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp4_) {
-#line 1331 "Branch.c"
-		CommandManager* _tmp5_ = NULL;
-		CommandManager* _tmp6_ = NULL;
-		SavedSearch* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		RenameSavedSearchCommand* _tmp9_ = NULL;
-		RenameSavedSearchCommand* _tmp10_ = NULL;
+#line 1328 "Branch.c"
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
+		SavedSearch* _tmp7_;
+		const gchar* _tmp8_;
+		RenameSavedSearchCommand* _tmp9_;
+		RenameSavedSearchCommand* _tmp10_;
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = app_window_get_command_manager ();
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1352,13 +1349,13 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 		_g_object_unref0 (_tmp10_);
 #line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1356 "Branch.c"
+#line 1353 "Branch.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
-		SavedSearch* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		const gchar* _tmp11_;
+		SavedSearch* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gboolean _tmp15_;
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp11_ = new_name;
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1373,10 +1370,10 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 		_g_free0 (_tmp14_);
 #line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (_tmp15_) {
-#line 1377 "Branch.c"
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+#line 1374 "Branch.c"
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp16_ = new_name;
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1387,7 +1384,7 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 			app_window_error_message (_tmp18_, NULL);
 #line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_free0 (_tmp18_);
-#line 1391 "Branch.c"
+#line 1388 "Branch.c"
 		}
 	}
 }
@@ -1395,8 +1392,8 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 
 static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
 	SearchesSidebarEntry * self;
-	SavedSearch* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SavedSearch* _tmp0_;
+	gboolean _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1405,12 +1402,12 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
 #line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp1_) {
-#line 1409 "Branch.c"
-		CommandManager* _tmp2_ = NULL;
-		CommandManager* _tmp3_ = NULL;
-		SavedSearch* _tmp4_ = NULL;
-		DeleteSavedSearchCommand* _tmp5_ = NULL;
-		DeleteSavedSearchCommand* _tmp6_ = NULL;
+#line 1406 "Branch.c"
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		SavedSearch* _tmp4_;
+		DeleteSavedSearchCommand* _tmp5_;
+		DeleteSavedSearchCommand* _tmp6_;
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1427,30 +1424,30 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 		_g_object_unref0 (_tmp6_);
 #line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1431 "Branch.c"
+#line 1428 "Branch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) searches_sidebar_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
 #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = g_strdup ("edit-find");
 #line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1454 "Branch.c"
+#line 1451 "Branch.c"
 }
 
 
@@ -1458,10 +1455,10 @@ static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (Side
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable;
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1465 "Branch.c"
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
+#line 1462 "Branch.c"
 }
 
 
@@ -1469,19 +1466,19 @@ static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (Sid
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source;
-#line 1474 "Branch.c"
+	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
+#line 1471 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1481 "Branch.c"
+#line 1478 "Branch.c"
 }
 
 
-static void searches_sidebar_entry_finalize (GObject* obj) {
+static void searches_sidebar_entry_finalize (GObject * obj) {
 	SearchesSidebarEntry * self;
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
@@ -1489,7 +1486,7 @@ static void searches_sidebar_entry_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->search);
 #line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1493 "Branch.c"
+#line 1490 "Branch.c"
 }