New upstream version 0.24.1upstream/0.24.1

1 files changed, 480 insertions, 480 deletions

diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 2e98ee8..0fa5e34 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.34.1, the Vala compiler
  * generated from ContainerSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -394,27 +394,27 @@ ContainerSourceCollection* container_source_collection_construct (GType object_t
 	void* _tmp1__target = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (backlink_name != NULL, NULL);
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = name;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = source_key_func;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1__target = source_key_func_target;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = (ContainerSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = backlink_name;
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_free0 (self->priv->backlink_name);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self->priv->backlink_name = _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return self;
 #line 420 "ContainerSourceCollection.c"
 }
@@ -428,40 +428,40 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl
 	SourceBacklink* _tmp2_ = NULL;
 	ContainerSource* _tmp3_ = NULL;
 	ContainerSource* _tmp4_ = NULL;
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = backlink;
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = sources;
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_backlink_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_, _tmp1_);
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = backlink;
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp3_ = container_source_collection_convert_backlink_to_container (self, _tmp2_);
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	container = _tmp3_;
 #line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	container = _tmp3_;
+#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp4_ = container;
-#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp4_ != NULL) {
 #line 454 "ContainerSourceCollection.c"
 		ContainerSource* _tmp5_ = NULL;
 		GeeCollection* _tmp6_ = NULL;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp5_ = container;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp6_ = sources;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_);
 #line 463 "ContainerSourceCollection.c"
 	}
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (container);
 #line 467 "ContainerSourceCollection.c"
 }
@@ -474,17 +474,17 @@ static void container_source_collection_real_notify_container_contents_added (Co
 	ContainerSource* _tmp8_ = NULL;
 	GeeCollection* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (added));
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = container;
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp2_) {
 #line 490 "ContainerSourceCollection.c"
 		gboolean removed = FALSE;
@@ -493,40 +493,40 @@ static void container_source_collection_real_notify_container_contents_added (Co
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
 		ContainerSource* _tmp7_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp3_ = self->priv->holding_tank;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp4_ = container;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp5_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-		removed = _tmp5_;
 #line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+		removed = _tmp5_;
+#line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp6_ = removed;
-#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_vala_assert (_tmp6_, "removed");
-#line 64 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp7_ = container;
-#line 64 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
 #line 513 "ContainerSourceCollection.c"
 	}
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp8_ = container;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp9_ = added;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp10_ = relinked;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_emit_by_name (self, "container-contents-added", _tmp8_, _tmp9_, _tmp10_);
 #line 523 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) {
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_added (self, container, added, relinked);
 #line 532 "ContainerSourceCollection.c"
 }
@@ -536,26 +536,26 @@ static void container_source_collection_real_notify_container_contents_removed (
 	ContainerSource* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (removed));
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = container;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = removed;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = unlinked;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_emit_by_name (self, "container-contents-removed", _tmp0_, _tmp1_, _tmp2_);
 #line 552 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) {
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_removed (self, container, removed, unlinked);
 #line 561 "ContainerSourceCollection.c"
 }
@@ -567,32 +567,32 @@ static void container_source_collection_real_notify_container_contents_altered (
 	gboolean _tmp2_ = FALSE;
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = container;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = added;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = relinked;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp3_ = removed;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp4_ = unlinked;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_emit_by_name (self, "container-contents-altered", _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
 #line 589 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) {
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_altered (self, container, added, relinked, removed, unlinked);
 #line 598 "ContainerSourceCollection.c"
 }
@@ -601,80 +601,80 @@ void container_source_collection_notify_container_contents_altered (ContainerSou
 static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
 	ContainerSource* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = container;
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = sources;
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_emit_by_name (self, "backlink-to-container-removed", _tmp0_, _tmp1_);
 #line 615 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_to_container_removed (self, container, sources);
 #line 624 "ContainerSourceCollection.c"
 }
 
 
 static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) {
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_critical ("Type `%s' does not implement abstract method `container_source_collection_get_containers_holding_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return NULL;
 #line 633 "ContainerSourceCollection.c"
 }
 
 
 GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) {
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source);
 #line 642 "ContainerSourceCollection.c"
 }
 
 
 static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) {
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_critical ("Type `%s' does not implement abstract method `container_source_collection_convert_backlink_to_container'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return NULL;
 #line 651 "ContainerSourceCollection.c"
 }
 
 
 ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) {
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink);
 #line 660 "ContainerSourceCollection.c"
 }
 
 
 void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) {
-#line 91 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 667 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeHashSet* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_collection_it = _tmp1_;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 680 "ContainerSourceCollection.c"
 			GeeIterator* _tmp2_ = NULL;
@@ -683,31 +683,31 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 			GeeIterator* _tmp4_ = NULL;
 			gpointer _tmp5_ = NULL;
 			SourceCollection* _tmp6_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp3_) {
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 695 "ContainerSourceCollection.c"
 			}
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			collection = (SourceCollection*) _tmp5_;
 #line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			collection = (SourceCollection*) _tmp5_;
+#line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = collection;
-#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
 #line 709 "ContainerSourceCollection.c"
 		}
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
 #line 713 "ContainerSourceCollection.c"
 	}
@@ -715,20 +715,20 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
 
 
 void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) {
-#line 96 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 721 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeHashSet* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_collection_it = _tmp1_;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 734 "ContainerSourceCollection.c"
 			GeeIterator* _tmp2_ = NULL;
@@ -737,31 +737,31 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol
 			GeeIterator* _tmp4_ = NULL;
 			gpointer _tmp5_ = NULL;
 			SourceCollection* _tmp6_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp3_) {
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 749 "ContainerSourceCollection.c"
 			}
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			collection = (SourceCollection*) _tmp5_;
 #line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			collection = (SourceCollection*) _tmp5_;
+#line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = collection;
-#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
 #line 763 "ContainerSourceCollection.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
 #line 767 "ContainerSourceCollection.c"
 	}
@@ -773,17 +773,17 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl
 	GeeHashSet* _tmp0_ = NULL;
 	GeeSet* _tmp1_ = NULL;
 	GeeSet* _tmp2_ = NULL;
-#line 101 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = gee_abstract_set_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_SET, GeeAbstractSet));
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return result;
 #line 789 "ContainerSourceCollection.c"
 }
@@ -792,15 +792,15 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl
 void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) {
 	GeeHashSet* _tmp0_ = NULL;
 	ContainerSource* _tmp1_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 105 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (IS_CONTAINER_SOURCE (unlinked));
 #line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (IS_CONTAINER_SOURCE (unlinked));
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = unlinked;
-#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 806 "ContainerSourceCollection.c"
 }
@@ -809,15 +809,15 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s
 void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) {
 	GeeHashSet* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 109 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (unlinked));
 #line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (unlinked));
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = unlinked;
-#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
 #line 823 "ContainerSourceCollection.c"
 }
@@ -829,31 +829,31 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
 	ContainerSource* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	ContainerSource* _tmp3_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE);
-#line 113 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_val_if_fail (IS_CONTAINER_SOURCE (source), FALSE);
 #line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_val_if_fail (IS_CONTAINER_SOURCE (source), FALSE);
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = source;
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	if (!_tmp2_) {
 #line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	if (!_tmp2_) {
+#line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		result = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		return result;
 #line 849 "ContainerSourceCollection.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp3_ = source;
-#line 117 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
-#line 119 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	result = TRUE;
-#line 119 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return result;
 #line 859 "ContainerSourceCollection.c"
 }
@@ -862,28 +862,28 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
 static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) {
 	GeeHashMultiMap* map = NULL;
 	GeeHashMultiMap* _tmp0_ = NULL;
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
 #line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
+#line 124 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_freeze_attached_notifications (self);
-#line 125 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 125 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	map = _tmp0_;
 #line 876 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = unlinking;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_source_it = _tmp2_;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 889 "ContainerSourceCollection.c"
 			GeeIterator* _tmp3_ = NULL;
@@ -896,56 +896,56 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			GeeCollection* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			GeeCollection* _tmp10_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = _source_it;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp4_) {
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 908 "ContainerSourceCollection.c"
 			}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = _source_it;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			source = (DataSource*) _tmp6_;
 #line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			source = (DataSource*) _tmp6_;
+#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp7_ = source;
-#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp8_ = container_source_collection_get_containers_holding_source (self, _tmp7_);
-#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			containers = _tmp8_;
 #line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			containers = _tmp8_;
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp10_ = containers;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp10_ == NULL) {
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp9_ = TRUE;
 #line 928 "ContainerSourceCollection.c"
 			} else {
 				GeeCollection* _tmp11_ = NULL;
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp11_ = containers;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp12_ = gee_collection_get_size (_tmp11_);
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp13_ = _tmp12_;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp9_ = _tmp13_ == 0;
 #line 941 "ContainerSourceCollection.c"
 			}
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			if (_tmp9_) {
 #line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			if (_tmp9_) {
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (containers);
-#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (source);
-#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				continue;
 #line 951 "ContainerSourceCollection.c"
 			}
@@ -953,13 +953,13 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 				GeeIterator* _container_it = NULL;
 				GeeCollection* _tmp14_ = NULL;
 				GeeIterator* _tmp15_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp14_ = containers;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_container_it = _tmp15_;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				while (TRUE) {
 #line 965 "ContainerSourceCollection.c"
 					GeeIterator* _tmp16_ = NULL;
@@ -974,57 +974,57 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 					ContainerSource* _tmp24_ = NULL;
 					SourceBacklink* _tmp25_ = NULL;
 					SourceBacklink* _tmp26_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp16_ = _container_it;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp17_ = gee_iterator_next (_tmp16_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					if (!_tmp17_) {
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						break;
 #line 986 "ContainerSourceCollection.c"
 					}
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp18_ = _container_it;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp19_ = gee_iterator_get (_tmp18_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-					container = (ContainerSource*) _tmp19_;
 #line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+					container = (ContainerSource*) _tmp19_;
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp20_ = map;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp21_ = container;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp22_ = source;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-					gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp21_, _tmp22_);
 #line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+					gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp21_, _tmp22_);
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp23_ = source;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp24_ = container;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp25_ = container_source_get_backlink (_tmp24_);
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp26_ = _tmp25_;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					data_source_set_backlink (_tmp23_, _tmp26_);
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_source_backlink_unref0 (_tmp26_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_g_object_unref0 (container);
 #line 1016 "ContainerSourceCollection.c"
 				}
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_container_it);
 #line 1020 "ContainerSourceCollection.c"
 			}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (containers);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (source);
 #line 1026 "ContainerSourceCollection.c"
 		}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_source_it);
 #line 1030 "ContainerSourceCollection.c"
 	}
@@ -1035,21 +1035,21 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 		GeeSet* _tmp29_ = NULL;
 		GeeIterator* _tmp30_ = NULL;
 		GeeIterator* _tmp31_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp27_ = map;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp28_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp29_ = _tmp28_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp31_ = _tmp30_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_tmp29_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_container_it = _tmp31_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1055 "ContainerSourceCollection.c"
 			GeeIterator* _tmp32_ = NULL;
@@ -1062,54 +1062,54 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 			ContainerSource* _tmp38_ = NULL;
 			GeeCollection* _tmp39_ = NULL;
 			GeeCollection* _tmp40_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp32_ = _container_it;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp33_ = gee_iterator_next (_tmp32_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp33_) {
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1074 "ContainerSourceCollection.c"
 			}
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp34_ = _container_it;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp35_ = gee_iterator_get (_tmp34_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			container = (ContainerSource*) _tmp35_;
 #line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			container = (ContainerSource*) _tmp35_;
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp36_ = container;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp37_ = map;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp38_ = container;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp39_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp38_);
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp40_ = _tmp39_;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			container_source_break_link_many (_tmp36_, _tmp40_);
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (_tmp40_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (container);
 #line 1098 "ContainerSourceCollection.c"
 		}
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_container_it);
 #line 1102 "ContainerSourceCollection.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_thaw_attached_notifications (self);
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (map);
 #line 1108 "ContainerSourceCollection.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 1115 "ContainerSourceCollection.c"
 }
@@ -1118,28 +1118,28 @@ static gpointer _g_object_ref0 (gpointer self) {
 static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) {
 	GeeHashMultiMap* map = NULL;
 	GeeHashMultiMap* _tmp0_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (relinked));
 #line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (relinked));
+#line 147 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_freeze_attached_notifications (self);
-#line 148 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	map = _tmp0_;
 #line 1132 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = relinked;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_source_it = _tmp2_;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1145 "ContainerSourceCollection.c"
 			GeeIterator* _tmp3_ = NULL;
@@ -1153,58 +1153,58 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			GeeList* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			GeeList* _tmp11_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = _source_it;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp4_) {
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1165 "ContainerSourceCollection.c"
 			}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = _source_it;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			source = (DataSource*) _tmp6_;
 #line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			source = (DataSource*) _tmp6_;
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp7_ = source;
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp8_ = self->priv->backlink_name;
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp9_ = data_source_get_backlinks (_tmp7_, _tmp8_);
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			backlinks = _tmp9_;
 #line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			backlinks = _tmp9_;
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp11_ = backlinks;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp11_ == NULL) {
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp10_ = TRUE;
 #line 1187 "ContainerSourceCollection.c"
 			} else {
 				GeeList* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp12_ = backlinks;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp14_ = _tmp13_;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp10_ = _tmp14_ == 0;
 #line 1200 "ContainerSourceCollection.c"
 			}
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			if (_tmp10_) {
 #line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			if (_tmp10_) {
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (backlinks);
-#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (source);
-#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				continue;
 #line 1210 "ContainerSourceCollection.c"
 			}
@@ -1217,23 +1217,23 @@ static void container_source_collection_on_contained_sources_relinked (Container
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
 				gint _backlink_index = 0;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp15_ = backlinks;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_backlink_list = _tmp16_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp17_ = _backlink_list;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp19_ = _tmp18_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_backlink_size = _tmp19_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_backlink_index = -1;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				while (TRUE) {
 #line 1239 "ContainerSourceCollection.c"
 					gint _tmp20_ = 0;
@@ -1247,49 +1247,49 @@ static void container_source_collection_on_contained_sources_relinked (Container
 					SourceBacklink* _tmp26_ = NULL;
 					ContainerSource* _tmp27_ = NULL;
 					ContainerSource* _tmp28_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp20_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_backlink_index = _tmp20_ + 1;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp21_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp22_ = _backlink_size;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					if (!(_tmp21_ < _tmp22_)) {
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						break;
 #line 1263 "ContainerSourceCollection.c"
 					}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp23_ = _backlink_list;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp24_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-					backlink = (SourceBacklink*) _tmp25_;
 #line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+					backlink = (SourceBacklink*) _tmp25_;
+#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp26_ = backlink;
-#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp27_ = container_source_collection_convert_backlink_to_container (self, _tmp26_);
-#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-					container = _tmp27_;
 #line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+					container = _tmp27_;
+#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_tmp28_ = container;
-#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					if (_tmp28_ != NULL) {
 #line 1283 "ContainerSourceCollection.c"
 						GeeHashMultiMap* _tmp29_ = NULL;
 						ContainerSource* _tmp30_ = NULL;
 						DataSource* _tmp31_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp29_ = map;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp30_ = container;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp31_ = source;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp30_, _tmp31_);
 #line 1295 "ContainerSourceCollection.c"
 					} else {
@@ -1299,44 +1299,44 @@ static void container_source_collection_on_contained_sources_relinked (Container
 						SourceBacklink* _tmp35_ = NULL;
 						gchar* _tmp36_ = NULL;
 						gchar* _tmp37_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp32_ = source;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp33_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp34_ = _tmp33_;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp35_ = backlink;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp36_ = source_backlink_to_string (_tmp35_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_tmp37_ = _tmp36_;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-						g_warning ("ContainerSourceCollection.vala:161: Unable to relink %s to container b" \
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+						g_warning ("ContainerSourceCollection.vala:162: Unable to relink %s to container b" \
 "acklink %s", _tmp34_, _tmp37_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_g_free0 (_tmp37_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 						_g_free0 (_tmp34_);
 #line 1321 "ContainerSourceCollection.c"
 					}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_g_object_unref0 (container);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 					_source_backlink_unref0 (backlink);
 #line 1327 "ContainerSourceCollection.c"
 				}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_backlink_list);
 #line 1331 "ContainerSourceCollection.c"
 			}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (backlinks);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (source);
 #line 1337 "ContainerSourceCollection.c"
 		}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_source_it);
 #line 1341 "ContainerSourceCollection.c"
 	}
@@ -1347,21 +1347,21 @@ static void container_source_collection_on_contained_sources_relinked (Container
 		GeeSet* _tmp40_ = NULL;
 		GeeIterator* _tmp41_ = NULL;
 		GeeIterator* _tmp42_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp38_ = map;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp39_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp40_ = _tmp39_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp41_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp42_ = _tmp41_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_tmp40_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_container_it = _tmp42_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1366 "ContainerSourceCollection.c"
 			GeeIterator* _tmp43_ = NULL;
@@ -1374,47 +1374,47 @@ static void container_source_collection_on_contained_sources_relinked (Container
 			ContainerSource* _tmp49_ = NULL;
 			GeeCollection* _tmp50_ = NULL;
 			GeeCollection* _tmp51_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp43_ = _container_it;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp44_ = gee_iterator_next (_tmp43_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp44_) {
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1385 "ContainerSourceCollection.c"
 			}
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp45_ = _container_it;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp46_ = gee_iterator_get (_tmp45_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			container = (ContainerSource*) _tmp46_;
 #line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			container = (ContainerSource*) _tmp46_;
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp47_ = container;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp48_ = map;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp49_ = container;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp50_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp49_);
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp51_ = _tmp50_;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			container_source_establish_link_many (_tmp47_, _tmp51_);
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (_tmp51_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_g_object_unref0 (container);
 #line 1409 "ContainerSourceCollection.c"
 		}
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_container_it);
 #line 1413 "ContainerSourceCollection.c"
 	}
-#line 170 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_thaw_attached_notifications (self);
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (map);
 #line 1419 "ContainerSourceCollection.c"
 }
@@ -1424,17 +1424,17 @@ static void container_source_collection_on_contained_source_destroyed (Container
 	GeeIterator* iter = NULL;
 	GeeHashSet* _tmp0_ = NULL;
 	GeeIterator* _tmp1_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (IS_DATA_SOURCE (source));
+#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->holding_tank;
-#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	iter = _tmp1_;
 #line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	iter = _tmp1_;
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	while (TRUE) {
 #line 1439 "ContainerSourceCollection.c"
 		GeeIterator* _tmp2_ = NULL;
@@ -1445,60 +1445,60 @@ static void container_source_collection_on_contained_source_destroyed (Container
 		gboolean _tmp6_ = FALSE;
 		ContainerSource* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp2_ = iter;
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp3_ = gee_iterator_next (_tmp2_);
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		if (!_tmp3_) {
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			break;
 #line 1456 "ContainerSourceCollection.c"
 		}
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp4_ = iter;
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp5_ = gee_iterator_get (_tmp4_);
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		container = (ContainerSource*) _tmp5_;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp7_ = container;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp8_ = container_source_has_links (_tmp7_);
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		if (!_tmp8_) {
 #line 1470 "ContainerSourceCollection.c"
 			ContainerSource* _tmp9_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp9_ = container;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG);
 #line 1476 "ContainerSourceCollection.c"
 		} else {
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = FALSE;
 #line 1480 "ContainerSourceCollection.c"
 		}
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		if (_tmp6_) {
 #line 1484 "ContainerSourceCollection.c"
 			GeeIterator* _tmp10_ = NULL;
 			ContainerSource* _tmp11_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp10_ = iter;
-#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			gee_iterator_remove (_tmp10_);
 #line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			gee_iterator_remove (_tmp10_);
+#line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp11_ = container;
-#line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), TRUE);
 #line 1495 "ContainerSourceCollection.c"
 		}
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (container);
 #line 1499 "ContainerSourceCollection.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (iter);
 #line 1503 "ContainerSourceCollection.c"
 }
@@ -1507,22 +1507,22 @@ static void container_source_collection_on_contained_source_destroyed (Container
 static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) {
 	ContainerSourceCollection * self;
 	DataSource* _tmp10_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 187 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 1514 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeHashSet* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_collection_it = _tmp1_;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1527 "ContainerSourceCollection.c"
 			GeeIterator* _tmp2_ = NULL;
@@ -1534,45 +1534,45 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec
 			DataSource* _tmp7_ = NULL;
 			SourceBacklink* _tmp8_ = NULL;
 			SourceBacklink* _tmp9_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp3_) {
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1545 "ContainerSourceCollection.c"
 			}
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			collection = (SourceCollection*) _tmp5_;
 #line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			collection = (SourceCollection*) _tmp5_;
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = collection;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp7_ = source;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp8_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONTAINER_SOURCE, ContainerSource));
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp9_ = _tmp8_;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			source_collection_remove_backlink (_tmp6_, _tmp9_);
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_source_backlink_unref0 (_tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
 #line 1567 "ContainerSourceCollection.c"
 		}
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
 #line 1571 "ContainerSourceCollection.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp10_ = source;
-#line 192 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_);
 #line 1577 "ContainerSourceCollection.c"
 }
@@ -1582,22 +1582,22 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 	ContainerSource* _tmp21_ = NULL;
 	Marker* _tmp22_ = NULL;
 	Marker* _tmp23_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 199 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
 #line 1589 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeHashSet* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_collection_it = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1602 "ContainerSourceCollection.c"
 			GeeIterator* _tmp2_ = NULL;
@@ -1611,37 +1611,37 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 			SourceBacklink* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			gboolean _tmp11_ = FALSE;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp3_) {
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1622 "ContainerSourceCollection.c"
 			}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			collection = (SourceCollection*) _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			collection = (SourceCollection*) _tmp5_;
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = collection;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp7_ = container;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp8_ = container_source_get_backlink (_tmp7_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp9_ = _tmp8_;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp10_ = source_collection_has_backlink (_tmp6_, _tmp9_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp11_ = _tmp10_;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_source_backlink_unref0 (_tmp9_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (_tmp11_) {
 #line 1646 "ContainerSourceCollection.c"
 				ContainerSource* _tmp12_ = NULL;
@@ -1654,85 +1654,85 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
 				ContainerSource* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				gboolean _tmp20_ = FALSE;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp12_ = container;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp14_ = _tmp13_;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp15_ = source_collection_unlink_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, NULL, NULL);
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp16_ = _tmp15_;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_tmp16_);
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-				_g_object_unref0 (_tmp14_);
 #line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+				_g_object_unref0 (_tmp14_);
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp17_ = self->priv->holding_tank;
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp18_ = container;
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp19_ = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-				added = _tmp19_;
 #line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+				added = _tmp19_;
+#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_tmp20_ = added;
-#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-				_vala_assert (_tmp20_, "added");
 #line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+				_vala_assert (_tmp20_, "added");
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_data_collection_unref0 (collection);
-#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				_g_object_unref0 (_collection_it);
-#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				return;
 #line 1689 "ContainerSourceCollection.c"
 			}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
 #line 1693 "ContainerSourceCollection.c"
 		}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
 #line 1697 "ContainerSourceCollection.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp21_ = container;
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp22_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject));
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp23_ = _tmp22_;
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp23_, TRUE, NULL, NULL, NULL);
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (_tmp23_);
 #line 1709 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking);
 #line 1716 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
-#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked);
 #line 1723 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
 #line 1730 "ContainerSourceCollection.c"
 }
 
 
 static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
 #line 1737 "ContainerSourceCollection.c"
 }
@@ -1748,17 +1748,17 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 	SourceCollection* _tmp11_ = NULL;
 	SourceCollection* _tmp12_ = NULL;
 	SourceCollection* _tmp13_ = NULL;
-#line 212 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 212 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_return_if_fail (IS_SOURCE_COLLECTION (collection));
 #line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_return_if_fail (IS_SOURCE_COLLECTION (collection));
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp0_ = self->priv->attached_collections;
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp1_ = collection;
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	if (_tmp2_) {
 #line 1763 "ContainerSourceCollection.c"
 		SourceCollection* _tmp3_ = NULL;
@@ -1766,48 +1766,48 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp3_ = collection;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp4_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection));
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp5_ = _tmp4_;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp6_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp7_ = _tmp6_;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-		g_warning ("ContainerSourceCollection.vala:214: attempted to multiple-attach '%s' " \
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+		g_warning ("ContainerSourceCollection.vala:215: attempted to multiple-attach '%s' " \
 "to '%s'", _tmp5_, _tmp7_);
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_free0 (_tmp7_);
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-		_g_free0 (_tmp5_);
 #line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+		_g_free0 (_tmp5_);
+#line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		return;
 #line 1787 "ContainerSourceCollection.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp8_ = self->priv->attached_collections;
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp9_ = collection;
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp10_ = collection;
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_connect (_tmp10_, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
 #line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_signal_connect (_tmp10_, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
+#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp11_ = collection;
-#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_connect (_tmp11_, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
 #line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_signal_connect (_tmp11_, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
+#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp12_ = collection;
-#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
 #line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+	g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp13_ = collection;
-#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_signal_connect (_tmp13_, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
 #line 1811 "ContainerSourceCollection.c"
 }
@@ -1815,20 +1815,20 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
 
 void container_source_collection_detach_all_collections (ContainerSourceCollection* self) {
 	GeeHashSet* _tmp14_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
 #line 1819 "ContainerSourceCollection.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeHashSet* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp0_ = self->priv->attached_collections;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_collection_it = _tmp1_;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		while (TRUE) {
 #line 1832 "ContainerSourceCollection.c"
 			GeeIterator* _tmp2_ = NULL;
@@ -1844,57 +1844,57 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti
 			guint _tmp11_ = 0U;
 			SourceCollection* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp2_ = _collection_it;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			if (!_tmp3_) {
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 				break;
 #line 1854 "ContainerSourceCollection.c"
 			}
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp4_ = _collection_it;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			collection = (SourceCollection*) _tmp5_;
 #line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			collection = (SourceCollection*) _tmp5_;
+#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp6_ = collection;
-#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
 #line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
+#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp8_ = collection;
-#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
 #line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
+#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp10_ = collection;
-#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
 #line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_tmp12_ = collection;
-#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp13_, NULL, FALSE);
-#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 			_data_collection_unref0 (collection);
 #line 1888 "ContainerSourceCollection.c"
 		}
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 		_g_object_unref0 (_collection_it);
 #line 1892 "ContainerSourceCollection.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_tmp14_ = self->priv->attached_collections;
-#line 234 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1898 "ContainerSourceCollection.c"
 }
@@ -1992,9 +1992,9 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (
 
 
 static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
-#line 33 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 33 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 1998 "ContainerSourceCollection.c"
 }
@@ -2095,7 +2095,7 @@ static void container_source_collection_finalize (DataCollection* obj) {
 	ContainerSourceCollection * self;
 #line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 45 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 46 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_detach_all_collections (self);
 #line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	_g_object_unref0 (self->priv->attached_collections);