Merge branch 'feature/upstream' into develop

1 files changed, 306 insertions, 301 deletions

diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index 1203f72..7d92788 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.34.7, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.36.6, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -134,6 +134,11 @@ typedef struct _SingletonCollection SingletonCollection;
 typedef struct _SingletonCollectionClass SingletonCollectionClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _ParamSpecSourceHoldingTank ParamSpecSourceHoldingTank;
+enum  {
+	SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL,
+	SOURCE_HOLDING_TANK_LAST_SIGNAL
+};
+static guint source_holding_tank_signals[SOURCE_HOLDING_TANK_LAST_SIGNAL] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -269,38 +274,38 @@ void source_collection_relink (SourceCollection* self, DataSource* source);
 void source_collection_relink_many (SourceCollection* self, GeeCollection* relink);
 static void source_holding_tank_real_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
 static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void source_holding_tank_finalize (SourceHoldingTank* obj);
+static void source_holding_tank_finalize (SourceHoldingTank * obj);
 
 
 static void _source_holding_tank_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_on_source_destroyed ((SourceHoldingTank*) self, source);
-#line 279 "SourceHoldingTank.c"
+#line 284 "SourceHoldingTank.c"
 }
 
 
 static void _source_holding_tank_on_source_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_on_source_collection_thawed ((SourceHoldingTank*) self);
-#line 286 "SourceHoldingTank.c"
+#line 291 "SourceHoldingTank.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 293 "SourceHoldingTank.c"
+#line 298 "SourceHoldingTank.c"
 }
 
 
 SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
 	SourceHoldingTank* self = NULL;
-	SourceCollection* _tmp0_ = NULL;
-	SourceCollection* _tmp1_ = NULL;
-	SourceHoldingTankCheckToKeep _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SourceCollection* _tmp3_ = NULL;
-	SourceCollection* _tmp4_ = NULL;
+	SourceCollection* _tmp0_;
+	SourceCollection* _tmp1_;
+	SourceHoldingTankCheckToKeep _tmp2_;
+	void* _tmp2__target;
+	SourceCollection* _tmp3_;
+	SourceCollection* _tmp4_;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -331,22 +336,22 @@ SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceColle
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "thawed", (GCallback) _source_holding_tank_on_source_collection_thawed_data_collection_thawed, self);
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self;
-#line 335 "SourceHoldingTank.c"
+#line 340 "SourceHoldingTank.c"
 }
 
 
 SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target) {
 #line 39 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return source_holding_tank_construct (TYPE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target);
-#line 342 "SourceHoldingTank.c"
+#line 347 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp16_ = NULL;
-	GeeCollection* _tmp17_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp8_;
+	GeeCollection* _tmp16_;
+	GeeCollection* _tmp17_;
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -355,11 +360,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 	_tmp0_ = added;
 #line 54 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp0_ != NULL) {
-#line 359 "SourceHoldingTank.c"
+#line 364 "SourceHoldingTank.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp1_ = added;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -368,13 +373,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 			_source_it = _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 372 "SourceHoldingTank.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+#line 377 "SourceHoldingTank.c"
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				DataSource* _tmp7_ = NULL;
+				GeeIterator* _tmp5_;
+				gpointer _tmp6_;
+				DataSource* _tmp7_;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp3_ = _source_it;
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -383,7 +388,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				if (!_tmp4_) {
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 387 "SourceHoldingTank.c"
+#line 392 "SourceHoldingTank.c"
 				}
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp5_ = _source_it;
@@ -397,22 +402,22 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				data_source_notify_held_in_tank (_tmp7_, self);
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 401 "SourceHoldingTank.c"
+#line 406 "SourceHoldingTank.c"
 			}
 #line 55 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (_source_it);
-#line 405 "SourceHoldingTank.c"
+#line 410 "SourceHoldingTank.c"
 		}
 	}
 #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp8_ = removed;
 #line 59 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp8_ != NULL) {
-#line 412 "SourceHoldingTank.c"
+#line 417 "SourceHoldingTank.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp9_ = NULL;
-			GeeIterator* _tmp10_ = NULL;
+			GeeCollection* _tmp9_;
+			GeeIterator* _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp9_ = removed;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -421,13 +426,13 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 			_source_it = _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 425 "SourceHoldingTank.c"
-				GeeIterator* _tmp11_ = NULL;
-				gboolean _tmp12_ = FALSE;
+#line 430 "SourceHoldingTank.c"
+				GeeIterator* _tmp11_;
+				gboolean _tmp12_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
-				DataSource* _tmp15_ = NULL;
+				GeeIterator* _tmp13_;
+				gpointer _tmp14_;
+				DataSource* _tmp15_;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp11_ = _source_it;
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -436,7 +441,7 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				if (!_tmp12_) {
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 440 "SourceHoldingTank.c"
+#line 445 "SourceHoldingTank.c"
 				}
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp13_ = _source_it;
@@ -450,11 +455,11 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 				data_source_notify_held_in_tank (_tmp15_, NULL);
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 454 "SourceHoldingTank.c"
+#line 459 "SourceHoldingTank.c"
 			}
 #line 60 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (_source_it);
-#line 458 "SourceHoldingTank.c"
+#line 463 "SourceHoldingTank.c"
 		}
 	}
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -462,8 +467,8 @@ static void source_holding_tank_real_notify_contents_altered (SourceHoldingTank*
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp17_ = removed;
 #line 64 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	g_signal_emit_by_name (self, "contents-altered", _tmp16_, _tmp17_);
-#line 467 "SourceHoldingTank.c"
+	g_signal_emit (self, source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL], 0, _tmp16_, _tmp17_);
+#line 472 "SourceHoldingTank.c"
 }
 
 
@@ -472,14 +477,14 @@ void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCo
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 52 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	SOURCE_HOLDING_TANK_GET_CLASS (self)->notify_contents_altered (self, added, removed);
-#line 476 "SourceHoldingTank.c"
+#line 481 "SourceHoldingTank.c"
 }
 
 
 gint source_holding_tank_get_count (SourceHoldingTank* self) {
 	gint result = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), 0);
 #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -490,14 +495,14 @@ gint source_holding_tank_get_count (SourceHoldingTank* self) {
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 494 "SourceHoldingTank.c"
+#line 499 "SourceHoldingTank.c"
 }
 
 
 GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
 	GeeCollection* result = NULL;
-	DataSet* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	DataSet* _tmp0_;
+	GeeList* _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL);
 #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -508,16 +513,16 @@ GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 72 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 512 "SourceHoldingTank.c"
+#line 517 "SourceHoldingTank.c"
 }
 
 
 gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* source) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	DataSet* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	DataSet* _tmp1_;
+	DataSource* _tmp2_;
+	gboolean _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
 #line 75 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -532,11 +537,11 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour
 	if (_tmp3_) {
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp0_ = TRUE;
-#line 536 "SourceHoldingTank.c"
+#line 541 "SourceHoldingTank.c"
 	} else {
-		GeeHashSet* _tmp4_ = NULL;
-		DataSource* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		GeeHashSet* _tmp4_;
+		DataSource* _tmp5_;
+		gboolean _tmp6_;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp4_ = self->priv->unlinking;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -545,26 +550,26 @@ gboolean source_holding_tank_contains (SourceHoldingTank* self, DataSource* sour
 		_tmp6_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp0_ = _tmp6_;
-#line 549 "SourceHoldingTank.c"
+#line 554 "SourceHoldingTank.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 555 "SourceHoldingTank.c"
+#line 560 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean added = FALSE;
-	DataSet* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	GeeCollection* _tmp15_ = NULL;
+	DataSet* _tmp11_;
+	GeeCollection* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
+	GeeCollection* _tmp15_;
 #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 80 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -579,12 +584,12 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 	if (_tmp2_ == 0) {
 #line 82 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 583 "SourceHoldingTank.c"
+#line 588 "SourceHoldingTank.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp3_ = many;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -593,14 +598,14 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 		_source_it = _tmp4_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		while (TRUE) {
-#line 597 "SourceHoldingTank.c"
-			GeeIterator* _tmp5_ = NULL;
-			gboolean _tmp6_ = FALSE;
+#line 602 "SourceHoldingTank.c"
+			GeeIterator* _tmp5_;
+			gboolean _tmp6_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp7_ = NULL;
-			gpointer _tmp8_ = NULL;
-			DataSource* _tmp9_ = NULL;
-			gint64 _tmp10_ = 0LL;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			DataSource* _tmp9_;
+			gint64 _tmp10_;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp5_ = _source_it;
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -609,7 +614,7 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 			if (!_tmp6_) {
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				break;
-#line 613 "SourceHoldingTank.c"
+#line 618 "SourceHoldingTank.c"
 			}
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp7_ = _source_it;
@@ -627,11 +632,11 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 			data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject), _tmp10_);
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (source);
-#line 631 "SourceHoldingTank.c"
+#line 636 "SourceHoldingTank.c"
 		}
 #line 84 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_g_object_unref0 (_source_it);
-#line 635 "SourceHoldingTank.c"
+#line 640 "SourceHoldingTank.c"
 	}
 #line 87 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp11_ = self->priv->tank;
@@ -649,31 +654,31 @@ void source_holding_tank_add_many (SourceHoldingTank* self, GeeCollection* many)
 	_tmp15_ = many;
 #line 90 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_notify_contents_altered (self, _tmp15_, NULL);
-#line 653 "SourceHoldingTank.c"
+#line 658 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection* unlink) {
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	SourceCollection* _tmp5_ = NULL;
-	SourceCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	Marker* _tmp8_ = NULL;
-	Marker* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
-	GeeCollection* _tmp11_ = NULL;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeCollection* _tmp4_;
+	SourceCollection* _tmp5_;
+	SourceCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	Marker* _tmp8_;
+	Marker* _tmp9_;
+	GeeCollection* _tmp10_;
+	GeeCollection* _tmp11_;
 	gboolean added = FALSE;
-	DataSet* _tmp20_ = NULL;
-	GeeCollection* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	GeeHashSet* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
-	GeeCollection* _tmp26_ = NULL;
+	DataSet* _tmp20_;
+	GeeCollection* _tmp21_;
+	gboolean _tmp22_;
+	gboolean _tmp23_;
+	GeeHashSet* _tmp24_;
+	GeeCollection* _tmp25_;
+	GeeCollection* _tmp26_;
 #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 95 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -688,7 +693,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	if (_tmp2_ == 0) {
 #line 97 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 692 "SourceHoldingTank.c"
+#line 697 "SourceHoldingTank.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->unlinking;
@@ -714,11 +719,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	_g_object_unref0 (_tmp11_);
 #line 102 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (_tmp9_);
-#line 718 "SourceHoldingTank.c"
+#line 723 "SourceHoldingTank.c"
 	{
 		GeeIterator* _source_it = NULL;
-		GeeCollection* _tmp12_ = NULL;
-		GeeIterator* _tmp13_ = NULL;
+		GeeCollection* _tmp12_;
+		GeeIterator* _tmp13_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp12_ = unlink;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -727,14 +732,14 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 		_source_it = _tmp13_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		while (TRUE) {
-#line 731 "SourceHoldingTank.c"
-			GeeIterator* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+#line 736 "SourceHoldingTank.c"
+			GeeIterator* _tmp14_;
+			gboolean _tmp15_;
 			DataSource* source = NULL;
-			GeeIterator* _tmp16_ = NULL;
-			gpointer _tmp17_ = NULL;
-			DataSource* _tmp18_ = NULL;
-			gint64 _tmp19_ = 0LL;
+			GeeIterator* _tmp16_;
+			gpointer _tmp17_;
+			DataSource* _tmp18_;
+			gint64 _tmp19_;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp14_ = _source_it;
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -743,7 +748,7 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 			if (!_tmp15_) {
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				break;
-#line 747 "SourceHoldingTank.c"
+#line 752 "SourceHoldingTank.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp16_ = _source_it;
@@ -761,11 +766,11 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 			data_object_internal_set_ordinal (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject), _tmp19_);
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_g_object_unref0 (source);
-#line 765 "SourceHoldingTank.c"
+#line 770 "SourceHoldingTank.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_g_object_unref0 (_source_it);
-#line 769 "SourceHoldingTank.c"
+#line 774 "SourceHoldingTank.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp20_ = self->priv->tank;
@@ -789,15 +794,15 @@ void source_holding_tank_unlink_and_hold (SourceHoldingTank* self, GeeCollection
 	_tmp26_ = unlink;
 #line 113 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_holding_tank_notify_contents_altered (self, _tmp26_, NULL);
-#line 793 "SourceHoldingTank.c"
+#line 798 "SourceHoldingTank.c"
 }
 
 
 gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
 	gboolean result = FALSE;
 	gint count = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), FALSE);
 #line 116 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -808,37 +813,37 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 	_tmp1_ = data_set_get_count (_tmp0_);
 #line 117 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp1_;
-#line 812 "SourceHoldingTank.c"
+#line 817 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 817 "SourceHoldingTank.c"
+#line 822 "SourceHoldingTank.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp2_ = TRUE;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 824 "SourceHoldingTank.c"
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				DataSet* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				DataObject* _tmp8_ = NULL;
-				DataSource* _tmp9_ = NULL;
-				SourceBacklink* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
+#line 829 "SourceHoldingTank.c"
+				gint _tmp4_;
+				gint _tmp5_;
+				DataSet* _tmp6_;
+				gint _tmp7_;
+				DataObject* _tmp8_;
+				DataSource* _tmp9_;
+				SourceBacklink* _tmp10_;
+				gboolean _tmp11_;
+				gboolean _tmp12_;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp2_) {
-#line 836 "SourceHoldingTank.c"
-					gint _tmp3_ = 0;
+#line 841 "SourceHoldingTank.c"
+					gint _tmp3_;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp3_ = ctr;
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp3_ + 1;
-#line 842 "SourceHoldingTank.c"
+#line 847 "SourceHoldingTank.c"
 				}
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp2_ = FALSE;
@@ -850,7 +855,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 				if (!(_tmp4_ < _tmp5_)) {
 #line 118 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 854 "SourceHoldingTank.c"
+#line 859 "SourceHoldingTank.c"
 				}
 #line 119 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp6_ = self->priv->tank;
@@ -874,7 +879,7 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 					result = TRUE;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					return result;
-#line 878 "SourceHoldingTank.c"
+#line 883 "SourceHoldingTank.c"
 				}
 			}
 		}
@@ -883,14 +888,14 @@ gboolean source_holding_tank_has_backlink (SourceHoldingTank* self, SourceBackli
 	result = FALSE;
 #line 123 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 887 "SourceHoldingTank.c"
+#line 892 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklink* backlink) {
 	gint count = 0;
-	DataSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	DataSet* _tmp0_;
+	gint _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 126 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -901,35 +906,35 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 	_tmp1_ = data_set_get_count (_tmp0_);
 #line 127 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp1_;
-#line 905 "SourceHoldingTank.c"
+#line 910 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 910 "SourceHoldingTank.c"
+#line 915 "SourceHoldingTank.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp2_ = TRUE;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 917 "SourceHoldingTank.c"
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
-				DataSet* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				DataObject* _tmp8_ = NULL;
-				DataSource* _tmp9_ = NULL;
-				SourceBacklink* _tmp10_ = NULL;
+#line 922 "SourceHoldingTank.c"
+				gint _tmp4_;
+				gint _tmp5_;
+				DataSet* _tmp6_;
+				gint _tmp7_;
+				DataObject* _tmp8_;
+				DataSource* _tmp9_;
+				SourceBacklink* _tmp10_;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp2_) {
-#line 927 "SourceHoldingTank.c"
-					gint _tmp3_ = 0;
+#line 932 "SourceHoldingTank.c"
+					gint _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp3_ = ctr;
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp3_ + 1;
-#line 933 "SourceHoldingTank.c"
+#line 938 "SourceHoldingTank.c"
 				}
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp2_ = FALSE;
@@ -941,7 +946,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 				if (!(_tmp4_ < _tmp5_)) {
 #line 128 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 945 "SourceHoldingTank.c"
+#line 950 "SourceHoldingTank.c"
 				}
 #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp6_ = self->priv->tank;
@@ -957,7 +962,7 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 				data_source_remove_backlink (_tmp9_, _tmp10_);
 #line 129 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (_tmp9_);
-#line 961 "SourceHoldingTank.c"
+#line 966 "SourceHoldingTank.c"
 			}
 		}
 	}
@@ -965,19 +970,19 @@ void source_holding_tank_remove_backlink (SourceHoldingTank* self, SourceBacklin
 
 
 void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* destroy, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) {
-	GeeList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean removed = FALSE;
-	DataSet* _tmp3_ = NULL;
-	GeeList* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	GeeList* _tmp7_ = NULL;
+	DataSet* _tmp3_;
+	GeeList* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	GeeList* _tmp7_;
 	gint count = 0;
-	GeeList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gint _tmp10_ = 0;
+	GeeList* _tmp8_;
+	gint _tmp9_;
+	gint _tmp10_;
 #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 132 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -994,7 +999,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 	if (_tmp2_ == 0) {
 #line 135 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 998 "SourceHoldingTank.c"
+#line 1003 "SourceHoldingTank.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->tank;
@@ -1020,39 +1025,39 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 	_tmp10_ = _tmp9_;
 #line 142 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	count = _tmp10_;
-#line 1024 "SourceHoldingTank.c"
+#line 1029 "SourceHoldingTank.c"
 	{
 		gint ctr = 0;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		ctr = 0;
-#line 1029 "SourceHoldingTank.c"
+#line 1034 "SourceHoldingTank.c"
 		{
 			gboolean _tmp11_ = FALSE;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			_tmp11_ = TRUE;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			while (TRUE) {
-#line 1036 "SourceHoldingTank.c"
-				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
+#line 1041 "SourceHoldingTank.c"
+				gint _tmp13_;
+				gint _tmp14_;
 				DataSource* source = NULL;
-				GeeList* _tmp15_ = NULL;
-				gint _tmp16_ = 0;
-				gpointer _tmp17_ = NULL;
-				DataSource* _tmp18_ = NULL;
-				gboolean _tmp19_ = FALSE;
-				gboolean _tmp20_ = FALSE;
-				ProgressMonitor _tmp24_ = NULL;
-				void* _tmp24__target = NULL;
+				GeeList* _tmp15_;
+				gint _tmp16_;
+				gpointer _tmp17_;
+				DataSource* _tmp18_;
+				gboolean _tmp19_;
+				gboolean _tmp20_;
+				ProgressMonitor _tmp24_;
+				void* _tmp24__target;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp11_) {
-#line 1050 "SourceHoldingTank.c"
-					gint _tmp12_ = 0;
+#line 1055 "SourceHoldingTank.c"
+					gint _tmp12_;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp12_ = ctr;
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					ctr = _tmp12_ + 1;
-#line 1056 "SourceHoldingTank.c"
+#line 1061 "SourceHoldingTank.c"
 				}
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp11_ = FALSE;
@@ -1064,7 +1069,7 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				if (!(_tmp13_ < _tmp14_)) {
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					break;
-#line 1068 "SourceHoldingTank.c"
+#line 1073 "SourceHoldingTank.c"
 				}
 #line 144 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_tmp15_ = destroy;
@@ -1082,22 +1087,22 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				_tmp20_ = data_source_destroy_orphan (_tmp18_, _tmp19_);
 #line 145 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (!_tmp20_) {
-#line 1086 "SourceHoldingTank.c"
-					GeeList* _tmp21_ = NULL;
+#line 1091 "SourceHoldingTank.c"
+					GeeList* _tmp21_;
 #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp21_ = not_removed;
 #line 146 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					if (NULL != _tmp21_) {
-#line 1092 "SourceHoldingTank.c"
-						GeeList* _tmp22_ = NULL;
-						DataSource* _tmp23_ = NULL;
+#line 1097 "SourceHoldingTank.c"
+						GeeList* _tmp22_;
+						DataSource* _tmp23_;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						_tmp22_ = not_removed;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						_tmp23_ = source;
 #line 147 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1101 "SourceHoldingTank.c"
+#line 1106 "SourceHoldingTank.c"
 					}
 				}
 #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1106,11 +1111,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 				_tmp24__target = monitor_target;
 #line 150 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				if (_tmp24_ != NULL) {
-#line 1110 "SourceHoldingTank.c"
-					ProgressMonitor _tmp25_ = NULL;
-					void* _tmp25__target = NULL;
-					gint _tmp26_ = 0;
-					gint _tmp27_ = 0;
+#line 1115 "SourceHoldingTank.c"
+					ProgressMonitor _tmp25_;
+					void* _tmp25__target;
+					gint _tmp26_;
+					gint _tmp27_;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp25_ = monitor;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1121,11 +1126,11 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 					_tmp27_ = count;
 #line 151 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 					_tmp25_ ((guint64) (_tmp26_ + 1), (guint64) _tmp27_, TRUE, _tmp25__target);
-#line 1125 "SourceHoldingTank.c"
+#line 1130 "SourceHoldingTank.c"
 				}
 #line 143 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 				_g_object_unref0 (source);
-#line 1129 "SourceHoldingTank.c"
+#line 1134 "SourceHoldingTank.c"
 			}
 		}
 	}
@@ -1133,17 +1138,17 @@ void source_holding_tank_destroy_orphans (SourceHoldingTank* self, GeeList* dest
 
 
 static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, DataSource* source) {
-	DataSet* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataSet* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
 	gboolean removed = FALSE;
-	DataSet* _tmp3_ = NULL;
-	DataSource* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	DataSource* _tmp7_ = NULL;
-	SingletonCollection* _tmp8_ = NULL;
-	SingletonCollection* _tmp9_ = NULL;
+	DataSet* _tmp3_;
+	DataSource* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	DataSource* _tmp7_;
+	SingletonCollection* _tmp8_;
+	SingletonCollection* _tmp9_;
 #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 155 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1158,7 +1163,7 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
 	if (!_tmp2_) {
 #line 157 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1162 "SourceHoldingTank.c"
+#line 1167 "SourceHoldingTank.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->tank;
@@ -1182,31 +1187,31 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
 	source_holding_tank_notify_contents_altered (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1186 "SourceHoldingTank.c"
+#line 1191 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataSource* source, Alteration* alteration) {
-	DataSet* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	SourceHoldingTankCheckToKeep _tmp8_ = NULL;
-	void* _tmp8__target = NULL;
-	DataSource* _tmp9_ = NULL;
-	Alteration* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	DataSet* _tmp0_;
+	DataSource* _tmp1_;
+	gboolean _tmp2_;
+	SourceHoldingTankCheckToKeep _tmp8_;
+	void* _tmp8__target;
+	DataSource* _tmp9_;
+	Alteration* _tmp10_;
+	gboolean _tmp11_;
 	gboolean removed = FALSE;
-	DataSet* _tmp12_ = NULL;
-	DataSource* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	SourceCollection* _tmp16_ = NULL;
-	gboolean _tmp17_ = FALSE;
-	DataSource* _tmp20_ = NULL;
-	SingletonCollection* _tmp21_ = NULL;
-	SingletonCollection* _tmp22_ = NULL;
-	SourceCollection* _tmp23_ = NULL;
-	DataSource* _tmp24_ = NULL;
+	DataSet* _tmp12_;
+	DataSource* _tmp13_;
+	gboolean _tmp14_;
+	gboolean _tmp15_;
+	SourceCollection* _tmp16_;
+	gboolean _tmp17_;
+	DataSource* _tmp20_;
+	SingletonCollection* _tmp21_;
+	SingletonCollection* _tmp22_;
+	SourceCollection* _tmp23_;
+	DataSource* _tmp24_;
 #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 166 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1221,12 +1226,12 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp2_ = data_set_contains (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 167 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!_tmp2_) {
-#line 1225 "SourceHoldingTank.c"
-		DataSource* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 1230 "SourceHoldingTank.c"
+		DataSource* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp3_ = source;
 #line 168 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1246,7 +1251,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 		_g_free0 (_tmp5_);
 #line 171 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1249 "SourceHoldingTank.c"
+#line 1254 "SourceHoldingTank.c"
 	}
 #line 175 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp8_ = self->priv->check_to_keep;
@@ -1262,7 +1267,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	if (_tmp11_) {
 #line 176 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1265 "SourceHoldingTank.c"
+#line 1270 "SourceHoldingTank.c"
 	}
 #line 178 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp12_ = self->priv->tank;
@@ -1282,9 +1287,9 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp17_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection));
 #line 181 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (_tmp17_) {
-#line 1285 "SourceHoldingTank.c"
-		GeeHashSet* _tmp18_ = NULL;
-		DataSource* _tmp19_ = NULL;
+#line 1290 "SourceHoldingTank.c"
+		GeeHashSet* _tmp18_;
+		DataSource* _tmp19_;
 #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		_tmp18_ = self->priv->relinks;
 #line 182 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1293,7 +1298,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
 #line 184 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1296 "SourceHoldingTank.c"
+#line 1301 "SourceHoldingTank.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp20_ = source;
@@ -1311,28 +1316,28 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 	_tmp24_ = source;
 #line 189 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	source_collection_relink (_tmp23_, _tmp24_);
-#line 1314 "SourceHoldingTank.c"
+#line 1319 "SourceHoldingTank.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1321 "SourceHoldingTank.c"
+#line 1326 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank* self) {
-	GeeHashSet* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeHashSet* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	GeeHashSet* copy = NULL;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
-	GeeHashSet* _tmp5_ = NULL;
-	GeeHashSet* _tmp6_ = NULL;
-	SourceCollection* _tmp7_ = NULL;
-	GeeHashSet* _tmp8_ = NULL;
+	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp4_;
+	GeeHashSet* _tmp5_;
+	GeeHashSet* _tmp6_;
+	SourceCollection* _tmp7_;
+	GeeHashSet* _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (IS_SOURCE_HOLDING_TANK (self));
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1345,7 +1350,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 	if (_tmp2_ == 0) {
 #line 194 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return;
-#line 1348 "SourceHoldingTank.c"
+#line 1353 "SourceHoldingTank.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp3_ = self->priv->relinks;
@@ -1371,13 +1376,13 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 	source_collection_relink_many (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 192 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (copy);
-#line 1374 "SourceHoldingTank.c"
+#line 1379 "SourceHoldingTank.c"
 }
 
 
 gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 205 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_val_if_fail (IS_SOURCE_HOLDING_TANK (self), NULL);
 #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1386,7 +1391,7 @@ gchar* source_holding_tank_to_string (SourceHoldingTank* self) {
 	result = _tmp0_;
 #line 206 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return result;
-#line 1389 "SourceHoldingTank.c"
+#line 1394 "SourceHoldingTank.c"
 }
 
 
@@ -1395,7 +1400,7 @@ static void source_holding_tank_real_contents_altered (SourceHoldingTank* self,
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
 #line 35 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1398 "SourceHoldingTank.c"
+#line 1403 "SourceHoldingTank.c"
 }
 
 
@@ -1414,26 +1419,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1417 "SourceHoldingTank.c"
+#line 1422 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		data2 = closure->data;
-#line 1423 "SourceHoldingTank.c"
+#line 1428 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1429 "SourceHoldingTank.c"
+#line 1434 "SourceHoldingTank.c"
 }
 
 
 static void value_source_holding_tank_init (GValue* value) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	value->data[0].v_pointer = NULL;
-#line 1436 "SourceHoldingTank.c"
+#line 1441 "SourceHoldingTank.c"
 }
 
 
@@ -1442,7 +1447,7 @@ static void value_source_holding_tank_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (value->data[0].v_pointer);
-#line 1445 "SourceHoldingTank.c"
+#line 1450 "SourceHoldingTank.c"
 	}
 }
 
@@ -1452,11 +1457,11 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		dest_value->data[0].v_pointer = source_holding_tank_ref (src_value->data[0].v_pointer);
-#line 1455 "SourceHoldingTank.c"
+#line 1460 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1459 "SourceHoldingTank.c"
+#line 1464 "SourceHoldingTank.c"
 	}
 }
 
@@ -1464,66 +1469,66 @@ static void value_source_holding_tank_copy_value (const GValue* src_value, GValu
 static gpointer value_source_holding_tank_peek_pointer (const GValue* value) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return value->data[0].v_pointer;
-#line 1467 "SourceHoldingTank.c"
+#line 1472 "SourceHoldingTank.c"
 }
 
 
 static gchar* value_source_holding_tank_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (collect_values[0].v_pointer) {
-#line 1474 "SourceHoldingTank.c"
-		SourceHoldingTank* object;
+#line 1479 "SourceHoldingTank.c"
+		SourceHoldingTank * object;
 		object = collect_values[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1481 "SourceHoldingTank.c"
+#line 1486 "SourceHoldingTank.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1485 "SourceHoldingTank.c"
+#line 1490 "SourceHoldingTank.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = source_holding_tank_ref (object);
-#line 1489 "SourceHoldingTank.c"
+#line 1494 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1493 "SourceHoldingTank.c"
+#line 1498 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return NULL;
-#line 1497 "SourceHoldingTank.c"
+#line 1502 "SourceHoldingTank.c"
 }
 
 
 static gchar* value_source_holding_tank_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SourceHoldingTank** object_p;
+	SourceHoldingTank ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!object_p) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1508 "SourceHoldingTank.c"
+#line 1513 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (!value->data[0].v_pointer) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = NULL;
-#line 1514 "SourceHoldingTank.c"
+#line 1519 "SourceHoldingTank.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1518 "SourceHoldingTank.c"
+#line 1523 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		*object_p = source_holding_tank_ref (value->data[0].v_pointer);
-#line 1522 "SourceHoldingTank.c"
+#line 1527 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return NULL;
-#line 1526 "SourceHoldingTank.c"
+#line 1531 "SourceHoldingTank.c"
 }
 
 
@@ -1537,7 +1542,7 @@ GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return G_PARAM_SPEC (spec);
-#line 1540 "SourceHoldingTank.c"
+#line 1545 "SourceHoldingTank.c"
 }
 
 
@@ -1546,12 +1551,12 @@ gpointer value_get_source_holding_tank (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK), NULL);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return value->data[0].v_pointer;
-#line 1549 "SourceHoldingTank.c"
+#line 1554 "SourceHoldingTank.c"
 }
 
 
 void value_set_source_holding_tank (GValue* value, gpointer v_object) {
-	SourceHoldingTank* old;
+	SourceHoldingTank * old;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1566,23 +1571,23 @@ void value_set_source_holding_tank (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_ref (value->data[0].v_pointer);
-#line 1569 "SourceHoldingTank.c"
+#line 1574 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1573 "SourceHoldingTank.c"
+#line 1578 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (old) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (old);
-#line 1579 "SourceHoldingTank.c"
+#line 1584 "SourceHoldingTank.c"
 	}
 }
 
 
 void value_take_source_holding_tank (GValue* value, gpointer v_object) {
-	SourceHoldingTank* old;
+	SourceHoldingTank * old;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_HOLDING_TANK));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1595,17 +1600,17 @@ void value_take_source_holding_tank (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = v_object;
-#line 1598 "SourceHoldingTank.c"
+#line 1603 "SourceHoldingTank.c"
 	} else {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		value->data[0].v_pointer = NULL;
-#line 1602 "SourceHoldingTank.c"
+#line 1607 "SourceHoldingTank.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (old) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		source_holding_tank_unref (old);
-#line 1608 "SourceHoldingTank.c"
+#line 1613 "SourceHoldingTank.c"
 	}
 }
 
@@ -1618,19 +1623,19 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) {
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_type_class_add_private (klass, sizeof (SourceHoldingTankPrivate));
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered;
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	g_signal_new ("contents_altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
-#line 1626 "SourceHoldingTank.c"
+	source_holding_tank_signals[SOURCE_HOLDING_TANK_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("contents-altered", TYPE_SOURCE_HOLDING_TANK, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceHoldingTankClass, contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
+#line 1631 "SourceHoldingTank.c"
 }
 
 
 static void source_holding_tank_instance_init (SourceHoldingTank * self) {
-	DataSet* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
-	GeeHashSet* _tmp2_ = NULL;
+	DataSet* _tmp0_;
+	GeeHashSet* _tmp1_;
+	GeeHashSet* _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->priv = SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1649,16 +1654,16 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) {
 	self->priv->ordinal = (gint64) 0;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->ref_count = 1;
-#line 1652 "SourceHoldingTank.c"
+#line 1657 "SourceHoldingTank.c"
 }
 
 
-static void source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void source_holding_tank_finalize (SourceHoldingTank * obj) {
 	SourceHoldingTank * self;
-	SourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	SourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	SourceCollection* _tmp0_;
+	guint _tmp1_;
+	SourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1683,7 +1688,7 @@ static void source_holding_tank_finalize (SourceHoldingTank* obj) {
 	_g_object_unref0 (self->priv->relinks);
 #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (self->priv->unlinking);
-#line 1686 "SourceHoldingTank.c"
+#line 1691 "SourceHoldingTank.c"
 }
 
 
@@ -1702,18 +1707,18 @@ GType source_holding_tank_get_type (void) {
 
 
 gpointer source_holding_tank_ref (gpointer instance) {
-	SourceHoldingTank* self;
+	SourceHoldingTank * self;
 	self = instance;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	return instance;
-#line 1711 "SourceHoldingTank.c"
+#line 1716 "SourceHoldingTank.c"
 }
 
 
 void source_holding_tank_unref (gpointer instance) {
-	SourceHoldingTank* self;
+	SourceHoldingTank * self;
 	self = instance;
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1721,7 +1726,7 @@ void source_holding_tank_unref (gpointer instance) {
 		SOURCE_HOLDING_TANK_GET_CLASS (self)->finalize (self);
 #line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1724 "SourceHoldingTank.c"
+#line 1729 "SourceHoldingTank.c"
 	}
 }