Merge tag 'upstream/0.24.1'

Upstream version 0.24.1
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
commit: 694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree: c098b2104f1b76db60dd1f50de060c4439437fd8 /src/core
parent: 6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent: b076314018e4b53d745823754a26eb6fb73a2801 (diff)
19 files changed, 1800 insertions, 1798 deletions
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index 2bb624a..6e3ca88 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.32.1, the Vala compiler
+/* Alteration.c generated by valac 0.34.1, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,19 +426,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 444 "Alteration.c"
 }
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);
diff --git a/src/core/ContainerSourceCollection.vala b/src/core/ContainerSourceCollection.vala
index a5b0fbc..cf6218a 100644
--- a/src/core/ContainerSourceCollection.vala
+++ b/src/core/ContainerSourceCollection.vala
@@ -18,15 +18,16 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
     private Gee.HashSet<ContainerSource> holding_tank = new Gee.HashSet<ContainerSource>();
     
     public virtual signal void container_contents_added(ContainerSource container,
-        Gee.Collection<DataSource> added, bool relinked) {
+        Gee.Collection<DataObject> added, bool relinked) {
     }
     
     public virtual signal void container_contents_removed(ContainerSource container, 
-        Gee.Collection<DataSource> removed, bool unlinked) {
+        Gee.Collection<DataObject> removed, bool unlinked) {
     }
     
     public virtual signal void container_contents_altered(ContainerSource container, 
-        Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+        Gee.Collection<DataObject>? added, bool relinked,
+        Gee.Collection<DataObject>? removed,
         bool unlinked) {
     }
     
@@ -55,7 +56,7 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
     }
     
     public virtual void notify_container_contents_added(ContainerSource container, 
-        Gee.Collection<DataSource> added, bool relinked) {
+        Gee.Collection<DataObject> added, bool relinked) {
         // if container is in holding tank, remove it now and relink to collection
         if (holding_tank.contains(container)) {
             bool removed = holding_tank.remove(container);
@@ -68,12 +69,12 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
     }
     
     public virtual void notify_container_contents_removed(ContainerSource container, 
-        Gee.Collection<DataSource> removed, bool unlinked) {
+        Gee.Collection<DataObject> removed, bool unlinked) {
         container_contents_removed(container, removed, unlinked);
     }
     
     public virtual void notify_container_contents_altered(ContainerSource container,
-        Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+        Gee.Collection<DataObject>? added, bool relinked, Gee.Collection<DataSource>? removed,
         bool unlinked) {
         container_contents_altered(container, added, relinked, removed, unlinked);
     }
diff --git a/src/core/Core.c b/src/core/Core.c
index 7fd60d2..5c9e67d 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.32.1, the Vala compiler
+/* Core.c generated by valac 0.34.1, the Vala compiler
  * generated from Core.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 7040412..457e2f7 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.32.1, the Vala compiler
+/* DataCollection.c generated by valac 0.34.1, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 7aaf2eb..84a9366 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.32.1, the Vala compiler
+/* DataObject.c generated by valac 0.34.1, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index 75c2ca2..6d2c3c6 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.32.1, the Vala compiler
+/* DataSet.c generated by valac 0.34.1, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 2b48942..fca0c0a 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.32.1, the Vala compiler
+/* DataSource.c generated by valac 0.34.1, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3373 "DataSource.c"
 }
@@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3514 "DataSource.c"
 }
@@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
 	const gchar* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3758 "DataSource.c"
 }
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index 0abd6e8..a576ccc 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.34.1, the Vala compiler
  * generated from DataSourceTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 40153fc..7729be1 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.32.1, the Vala compiler
+/* DataView.c generated by valac 0.34.1, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 0e55db0..cbb3a73 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataViewTypes.c generated by valac 0.34.1, the Vala compiler
  * generated from DataViewTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index b83be40..b9606dd 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.34.1, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 6321f92..fc92bbd 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* SourceCollection.c generated by valac 0.34.1, the Vala compiler
  * generated from SourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index ed7d671..c1b3e97 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.32.1, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.34.1, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index 5cfc5a9..4df09cd 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.34.1, the Vala compiler
  * generated from SourceInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index fa66f0e..1d1bd50 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.32.1, the Vala compiler
+/* Tracker.c generated by valac 0.34.1, the Vala compiler
  * generated from Tracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index 597091c..7c35370 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.32.1, the Vala compiler
+/* ViewCollection.c generated by valac 0.34.1, the Vala compiler
  * generated from ViewCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4128,27 +4128,27 @@ static void view_collection_real_items_altered (DataCollection* base, GeeMap* ma
 	GeeMap* _tmp0_ = NULL;
 	GeeSet* _tmp1_ = NULL;
 	GeeSet* _tmp2_ = NULL;
-	GeeSet* _tmp3_ = NULL;
+	GeeCollection* _tmp3_ = NULL;
 	GeeMap* _tmp4_ = NULL;
 #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = map;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp3_ = _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	view_collection_filter_altered_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	view_collection_filter_altered_items (self, _tmp3_);
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp3_);
-#line 651 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = map;
-#line 651 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp4_);
 #line 4153 "ViewCollection.c"
 }
@@ -4166,23 +4166,23 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
 	void* _tmp7__target = NULL;
 	ComparatorPredicate _tmp8_ = NULL;
 	void* _tmp8__target = NULL;
-#line 654 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = comparator;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1__target = comparator_target;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = predicate;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2__target = predicate_target;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
 #line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
+#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = self->priv->visible;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_ != NULL) {
 #line 4187 "ViewCollection.c"
 		DataSet* _tmp4_ = NULL;
@@ -4190,29 +4190,29 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
 		void* _tmp5__target = NULL;
 		ComparatorPredicate _tmp6_ = NULL;
 		void* _tmp6__target = NULL;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = self->priv->visible;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = comparator;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5__target = comparator_target;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = predicate;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6__target = predicate_target;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target);
 #line 4205 "ViewCollection.c"
 	}
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = comparator;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7__target = comparator_target;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8_ = predicate;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8__target = predicate_target;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp7__target, _tmp8_, _tmp8__target);
 #line 4217 "ViewCollection.c"
 }
@@ -4222,25 +4222,25 @@ static void view_collection_real_reset_comparator (DataCollection* base) {
 	ViewCollection * self;
 	DataSet* _tmp0_ = NULL;
 	DataSet* _tmp1_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	data_set_reset_comparator (_tmp0_);
 #line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	data_set_reset_comparator (_tmp0_);
+#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 4235 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		data_set_reset_comparator (_tmp2_);
 #line 4241 "ViewCollection.c"
 	}
-#line 667 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 668 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->reset_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 4245 "ViewCollection.c"
 }
@@ -4251,37 +4251,37 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_ = NULL;
 	DataSet* _tmp1_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 4260 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_set_get_all (_tmp2_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 4271 "ViewCollection.c"
 	} else {
 		GeeCollection* _tmp4_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
 #line 4280 "ViewCollection.c"
 	}
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4286 "ViewCollection.c"
 }
@@ -4290,13 +4290,13 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
 GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4301 "ViewCollection.c"
 }
@@ -4307,33 +4307,33 @@ static gint view_collection_real_get_count (DataCollection* base) {
 	gint result = 0;
 	gint _tmp0_ = 0;
 	DataSet* _tmp1_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 4316 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_set_get_count (_tmp2_);
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp3_;
 #line 4325 "ViewCollection.c"
 	} else {
 		gint _tmp4_ = 0;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
 #line 4332 "ViewCollection.c"
 	}
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4338 "ViewCollection.c"
 }
@@ -4342,13 +4342,13 @@ static gint view_collection_real_get_count (DataCollection* base) {
 gint view_collection_get_unfiltered_count (ViewCollection* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 682 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4353 "ViewCollection.c"
 }
@@ -4359,43 +4359,43 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
 	DataObject* result = NULL;
 	DataObject* _tmp0_ = NULL;
 	DataSet* _tmp1_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 4368 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		DataObject* _tmp4_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = index;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = data_set_get_at (_tmp2_, _tmp3_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
 #line 4382 "ViewCollection.c"
 	} else {
 		gint _tmp5_ = 0;
 		DataObject* _tmp6_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = index;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp6_;
 #line 4394 "ViewCollection.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4400 "ViewCollection.c"
 }
@@ -4406,41 +4406,41 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
 	gint result = 0;
 	gint _tmp0_ = 0;
 	DataSet* _tmp1_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
-#line 690 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
 #line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 4417 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
 		DataObject* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = object;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = data_set_index_of (_tmp2_, _tmp3_);
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
 #line 4429 "ViewCollection.c"
 	} else {
 		DataObject* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = object;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp6_;
 #line 4439 "ViewCollection.c"
 	}
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4445 "ViewCollection.c"
 }
@@ -4453,29 +4453,29 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
 	gboolean _tmp1_ = FALSE;
 	DataObject* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 694 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
-#line 694 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = object;
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_);
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (!_tmp1_) {
 #line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (!_tmp1_) {
+#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = FALSE;
-#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4470 "ViewCollection.c"
 	}
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = object;
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp3_;
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4480 "ViewCollection.c"
 }
@@ -4485,38 +4485,38 @@ static DataView* view_collection_real_get_first (ViewCollection* self) {
 	DataView* result = NULL;
 	DataView* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ > 0) {
 #line 4492 "ViewCollection.c"
 		DataObject* _tmp2_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
 #line 4500 "ViewCollection.c"
 	} else {
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = NULL;
 #line 4506 "ViewCollection.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4512 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_first (ViewCollection* self) {
-#line 704 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 704 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_first (self);
 #line 4521 "ViewCollection.c"
 }
@@ -4540,25 +4540,25 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 	gint num_views = 0;
 	gint _tmp2_ = 0;
 	DataView* _tmp17_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 720 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp0_ < 1) {
 #line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp0_ < 1) {
+#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4551 "ViewCollection.c"
 	}
-#line 724 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_first (self);
-#line 724 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	dv = _tmp1_;
 #line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	dv = _tmp1_;
+#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	num_views = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
 #line 4563 "ViewCollection.c"
 		gboolean _tmp3_ = FALSE;
@@ -4569,109 +4569,109 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
 		MediaSource* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		MediaSource* _tmp12_ = NULL;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = dv;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp4_ != NULL) {
 #line 4576 "ViewCollection.c"
 			DataView* _tmp5_ = NULL;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = dv;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = num_views;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = _tmp6_ < (_tmp7_ - 1);
 #line 4588 "ViewCollection.c"
 		} else {
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = FALSE;
 #line 4592 "ViewCollection.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (!_tmp3_) {
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
 #line 4598 "ViewCollection.c"
 		}
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = dv;
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp9_ = data_view_get_source (_tmp8_);
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp9_) : NULL;
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp10_ == NULL) {
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp9_);
 #line 4610 "ViewCollection.c"
 		}
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		tmp = _tmp10_;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp12_ = tmp;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp12_ != NULL) {
 #line 4618 "ViewCollection.c"
 			MediaSource* _tmp13_ = NULL;
 			Rating _tmp14_ = 0;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = tmp;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = media_source_get_rating (_tmp13_);
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = _tmp14_ != RATING_REJECTED;
 #line 4627 "ViewCollection.c"
 		} else {
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = FALSE;
 #line 4631 "ViewCollection.c"
 		}
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp11_) {
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			result = dv;
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (tmp);
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return result;
 #line 4641 "ViewCollection.c"
 		} else {
 			DataView* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = dv;
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp16_ = view_collection_get_next (self, _tmp15_);
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (dv);
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			dv = _tmp16_;
 #line 4653 "ViewCollection.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (tmp);
 #line 4657 "ViewCollection.c"
 	}
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp17_ = view_collection_get_first (self);
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp17_;
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (dv);
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4667 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_first_unrejected (ViewCollection* self) {
-#line 718 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 718 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self);
 #line 4676 "ViewCollection.c"
 }
@@ -4681,41 +4681,41 @@ static DataView* view_collection_real_get_last (ViewCollection* self) {
 	DataView* result = NULL;
 	DataView* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ > 0) {
 #line 4688 "ViewCollection.c"
 		gint _tmp2_ = 0;
 		DataObject* _tmp3_ = NULL;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_ - 1);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView);
 #line 4699 "ViewCollection.c"
 	} else {
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp0_);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = NULL;
 #line 4705 "ViewCollection.c"
 	}
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4711 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_last (ViewCollection* self) {
-#line 743 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 743 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_last (self);
 #line 4720 "ViewCollection.c"
 }
@@ -4733,64 +4733,64 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
 	DataObject* _tmp8_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
 #line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
+#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp0_ == 0) {
 #line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp0_ == 0) {
+#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4746 "ViewCollection.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view;
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	index = _tmp2_;
 #line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	index = _tmp2_;
+#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = index;
-#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp3_ < 0) {
 #line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp3_ < 0) {
+#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4762 "ViewCollection.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = index;
-#line 755 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	index = _tmp4_ + 1;
 #line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	index = _tmp4_ + 1;
+#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = index;
-#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp5_ >= _tmp6_) {
 #line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp5_ >= _tmp6_) {
+#line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		index = 0;
 #line 4776 "ViewCollection.c"
 	}
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = index;
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4786 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_next (ViewCollection* self, DataView* view) {
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view);
 #line 4795 "ViewCollection.c"
 }
@@ -4807,66 +4807,66 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
 	gint _tmp5_ = 0;
 	gint _tmp7_ = 0;
 	DataObject* _tmp8_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
 #line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
+#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp0_ == 0) {
 #line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp0_ == 0) {
+#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4820 "ViewCollection.c"
 	}
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view;
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	index = _tmp2_;
 #line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	index = _tmp2_;
+#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = index;
-#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp3_ < 0) {
 #line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp3_ < 0) {
+#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4836 "ViewCollection.c"
 	}
-#line 770 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = index;
-#line 770 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	index = _tmp4_ - 1;
 #line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	index = _tmp4_ - 1;
+#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = index;
-#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ < 0) {
 #line 4846 "ViewCollection.c"
 		gint _tmp6_ = 0;
-#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		index = _tmp6_ - 1;
 #line 4852 "ViewCollection.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = index;
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 4862 "ViewCollection.c"
 }
 
 
 DataView* view_collection_get_previous (ViewCollection* self, DataView* view) {
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view);
 #line 4871 "ViewCollection.c"
 }
@@ -4886,63 +4886,63 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 	DataView* prev_view = NULL;
 	DataView* _tmp19_ = NULL;
 	DataView* _tmp20_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 777 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (home), FALSE);
-#line 779 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_vala_next);
-#line 779 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_vala_next = NULL;
 #line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	_vala_next = NULL;
+#line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_vala_prev);
-#line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_prev = NULL;
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = home;
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	home_view = _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	home_view = _tmp1_;
+#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = home_view;
-#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp2_ == NULL) {
 #line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp2_ == NULL) {
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (home_view);
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (next) {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			*next = _vala_next;
 #line 4919 "ViewCollection.c"
 		} else {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_next);
 #line 4923 "ViewCollection.c"
 		}
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (prev) {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			*prev = _vala_prev;
 #line 4929 "ViewCollection.c"
 		} else {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_prev);
 #line 4933 "ViewCollection.c"
 		}
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 4937 "ViewCollection.c"
 	}
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = home_view;
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = view_collection_get_next (self, _tmp3_);
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	next_view = _tmp4_;
 #line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	next_view = _tmp4_;
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
 #line 4947 "ViewCollection.c"
 		DataView* _tmp5_ = NULL;
@@ -4951,21 +4951,21 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		const gchar* _tmp8_ = NULL;
 		DataView* _tmp17_ = NULL;
 		DataView* _tmp18_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = next_view;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = home_view;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (!(_tmp5_ != _tmp6_)) {
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
 #line 4962 "ViewCollection.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = type_selector;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp8_ == NULL) {
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = TRUE;
 #line 4970 "ViewCollection.c"
 		} else {
@@ -4975,60 +4975,60 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			gchar* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = next_view;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = data_view_get_source (_tmp9_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = _tmp10_;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = data_source_get_typename (_tmp11_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = _tmp12_;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = type_selector;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = g_strcmp0 (_tmp13_, _tmp14_) == 0;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_free0 (_tmp13_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp11_);
 #line 4996 "ViewCollection.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp7_) {
 #line 5000 "ViewCollection.c"
 			DataView* _tmp15_ = NULL;
 			DataSource* _tmp16_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = next_view;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp16_ = data_view_get_source (_tmp15_);
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_next);
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			_vala_next = _tmp16_;
 #line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			_vala_next = _tmp16_;
+#line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
 #line 5013 "ViewCollection.c"
 		}
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = next_view;
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp18_ = view_collection_get_next (self, _tmp17_);
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_view);
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		next_view = _tmp18_;
 #line 5023 "ViewCollection.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp19_ = home_view;
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp20_ = view_collection_get_previous (self, _tmp19_);
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	prev_view = _tmp20_;
 #line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	prev_view = _tmp20_;
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	while (TRUE) {
 #line 5033 "ViewCollection.c"
 		DataView* _tmp21_ = NULL;
@@ -5037,21 +5037,21 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 		const gchar* _tmp24_ = NULL;
 		DataView* _tmp33_ = NULL;
 		DataView* _tmp34_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp21_ = prev_view;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp22_ = home_view;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (!(_tmp21_ != _tmp22_)) {
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
 #line 5048 "ViewCollection.c"
 		}
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp24_ = type_selector;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp24_ == NULL) {
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp23_ = TRUE;
 #line 5056 "ViewCollection.c"
 		} else {
@@ -5061,82 +5061,82 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
 			gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp25_ = prev_view;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp26_ = data_view_get_source (_tmp25_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp27_ = _tmp26_;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp28_ = data_source_get_typename (_tmp27_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp29_ = _tmp28_;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp30_ = type_selector;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp23_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_free0 (_tmp29_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp27_);
 #line 5082 "ViewCollection.c"
 		}
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp23_) {
 #line 5086 "ViewCollection.c"
 			DataView* _tmp31_ = NULL;
 			DataSource* _tmp32_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp31_ = prev_view;
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp32_ = data_view_get_source (_tmp31_);
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_vala_prev);
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			_vala_prev = _tmp32_;
 #line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			_vala_prev = _tmp32_;
+#line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			break;
 #line 5099 "ViewCollection.c"
 		}
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp33_ = prev_view;
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp34_ = view_collection_get_previous (self, _tmp33_);
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (prev_view);
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		prev_view = _tmp34_;
 #line 5109 "ViewCollection.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (prev_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (next_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (home_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (next) {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*next = _vala_next;
 #line 5123 "ViewCollection.c"
 	} else {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_vala_next);
 #line 5127 "ViewCollection.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (prev) {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*prev = _vala_prev;
 #line 5133 "ViewCollection.c"
 	} else {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_vala_prev);
 #line 5137 "ViewCollection.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5141 "ViewCollection.c"
 }
@@ -5157,43 +5157,43 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 	DataSource* _tmp16_ = NULL;
 	GeeSet* _tmp26_ = NULL;
 	DataSource* _tmp27_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 808 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (home), NULL);
-#line 810 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 810 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = home;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = typename;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = view_collection_get_immediate_neighbors (self, _tmp1_, &_tmp3_, &_tmp4_, _tmp2_);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (next);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	next = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (prev);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	prev = _tmp4_;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (!_tmp5_) {
 #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (!_tmp5_) {
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = neighbors;
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (prev);
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next);
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 5192 "ViewCollection.c"
 	}
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = next;
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp6_ != NULL) {
 #line 5198 "ViewCollection.c"
 		GeeSet* _tmp7_ = NULL;
@@ -5205,50 +5205,50 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 		DataSource* _tmp11_ = NULL;
 		DataSource* _tmp12_ = NULL;
 		DataSource* _tmp13_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = neighbors;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = next;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp9_ = next;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp10_ = typename;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_get_immediate_neighbors (self, _tmp9_, &_tmp11_, &_tmp12_, _tmp10_);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_next);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		next_next = _tmp11_;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		next_prev = _tmp12_;
-#line 825 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp13_ = next_next;
-#line 825 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp13_ != NULL) {
 #line 5232 "ViewCollection.c"
 			GeeSet* _tmp14_ = NULL;
 			DataSource* _tmp15_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = neighbors;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = next_next;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
 #line 5241 "ViewCollection.c"
 		}
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_next);
 #line 5247 "ViewCollection.c"
 	}
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp16_ = prev;
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp16_ != NULL) {
 #line 5253 "ViewCollection.c"
 		GeeSet* _tmp17_ = NULL;
@@ -5260,60 +5260,60 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 		DataSource* _tmp21_ = NULL;
 		DataSource* _tmp22_ = NULL;
 		DataSource* _tmp23_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = neighbors;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp18_ = prev;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp19_ = prev;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp20_ = typename;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_get_immediate_neighbors (self, _tmp19_, &_tmp21_, &_tmp22_, _tmp20_);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		next_prev = _tmp21_;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (prev_prev);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		prev_prev = _tmp22_;
-#line 837 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp23_ = prev_prev;
-#line 837 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp23_ != NULL) {
 #line 5287 "ViewCollection.c"
 			GeeSet* _tmp24_ = NULL;
 			DataSource* _tmp25_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp24_ = neighbors;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp25_ = prev_prev;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 5296 "ViewCollection.c"
 		}
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (prev_prev);
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (next_prev);
 #line 5302 "ViewCollection.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp26_ = neighbors;
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp27_ = home;
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = neighbors;
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (prev);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (next);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5318 "ViewCollection.c"
 }
@@ -5328,19 +5328,19 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 	GeeCollection* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
-#line 849 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 849 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (views));
 #line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (views));
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = views;
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp2_ == 0) {
 #line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp2_ == 0) {
+#line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
 #line 5345 "ViewCollection.c"
 	}
@@ -5348,13 +5348,13 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 		GeeIterator* _view_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = views;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_view_it = _tmp4_;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 5359 "ViewCollection.c"
 			GeeIterator* _tmp5_ = NULL;
@@ -5364,47 +5364,47 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
 			gpointer _tmp8_ = NULL;
 			DataView* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _view_it;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp6_) {
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 5375 "ViewCollection.c"
 			}
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _view_it;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			view = (DataView*) _tmp8_;
 #line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			view = (DataView*) _tmp8_;
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = view;
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = data_view_is_visible (_tmp9_);
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_vala_assert (_tmp10_, "view.is_visible()");
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 5391 "ViewCollection.c"
 		}
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_view_it);
 #line 5395 "ViewCollection.c"
 	}
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp11_ = self->priv->selected;
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp12_ = views;
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp13_ = data_set_add_many (_tmp11_, _tmp12_);
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	added = _tmp13_;
 #line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	added = _tmp13_;
+#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp14_ = added;
-#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp14_, "added");
 #line 5409 "ViewCollection.c"
 }
@@ -5419,33 +5419,33 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
 	GeeCollection* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-#line 860 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 860 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (views));
 #line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (views));
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = views;
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp2_ == 0) {
 #line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp2_ == 0) {
+#line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
 #line 5436 "ViewCollection.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = self->priv->selected;
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = views;
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = data_set_remove_many (_tmp3_, _tmp4_);
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	removed = _tmp5_;
 #line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	removed = _tmp5_;
+#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = removed;
-#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp6_, "removed");
 #line 5450 "ViewCollection.c"
 }
@@ -5454,7 +5454,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
 static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self) {
 	gboolean result;
 	result = view_collection_select_item ((ViewCollection*) self, object, user);
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5459 "ViewCollection.c"
 }
@@ -5468,42 +5468,42 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 	GeeArrayList* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_MARKER (marker));
 #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_MARKER (marker));
+#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	selected = _tmp0_;
 #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	selected = _tmp0_;
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = marker;
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = selected;
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = selected;
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ > 0) {
 #line 5493 "ViewCollection.c"
 		GeeArrayList* _tmp6_ = NULL;
 		GeeArrayList* _tmp7_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = selected;
-#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = selected;
-#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
 #line 5504 "ViewCollection.c"
 	}
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (selected);
 #line 5508 "ViewCollection.c"
 }
@@ -5512,17 +5512,17 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 void view_collection_select_all (ViewCollection* self) {
 	Marker* marker = NULL;
 	Marker* _tmp0_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_VIEW_COLLECTION (self));
+#line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	marker = _tmp0_;
 #line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	marker_mark_all (marker);
+	marker = _tmp0_;
 #line 883 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	marker_mark_all (marker);
+#line 884 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_select_marked (self, marker);
-#line 880 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
 #line 5527 "ViewCollection.c"
 }
@@ -5538,81 +5538,81 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 	DataView* _tmp9_ = NULL;
 	DataView* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
 #line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = object;
-#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	view = _tmp1_;
 #line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	view = _tmp1_;
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = view;
-#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = data_view_is_selected (_tmp2_);
-#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_) {
 #line 5559 "ViewCollection.c"
 		DataView* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = view;
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = data_view_is_visible (_tmp4_);
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_) {
 #line 5568 "ViewCollection.c"
 			DataSet* _tmp6_ = NULL;
 			DataView* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = self->priv->selected;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = view;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_vala_assert (_tmp8_, "selected.contains(view)");
 #line 5580 "ViewCollection.c"
 		}
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = TRUE;
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (view);
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 5588 "ViewCollection.c"
 	}
-#line 895 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp9_ = view;
-#line 895 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_view_internal_set_selected (_tmp9_, TRUE);
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp10_ = view;
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp11_ = data_view_is_visible (_tmp10_);
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp11_) {
 #line 5600 "ViewCollection.c"
 		GObject* _tmp12_ = NULL;
 		DataView* _tmp13_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp12_ = user;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp13_ = view;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
 #line 5609 "ViewCollection.c"
 	}
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (view);
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5617 "ViewCollection.c"
 }
@@ -5621,7 +5621,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
 static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self) {
 	gboolean result;
 	result = view_collection_unselect_item ((ViewCollection*) self, object, user);
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5626 "ViewCollection.c"
 }
@@ -5635,42 +5635,42 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 	GeeArrayList* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_MARKER (marker));
 #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_MARKER (marker));
+#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	unselected = _tmp0_;
 #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	unselected = _tmp0_;
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = marker;
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = unselected;
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = unselected;
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_ > 0) {
 #line 5660 "ViewCollection.c"
 		GeeArrayList* _tmp6_ = NULL;
 		GeeArrayList* _tmp7_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = unselected;
-#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = unselected;
-#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 5671 "ViewCollection.c"
 	}
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
 #line 5675 "ViewCollection.c"
 }
@@ -5685,37 +5685,37 @@ void view_collection_unselect_all (ViewCollection* self) {
 	GeeList* _tmp4_ = NULL;
 	GeeList* _tmp5_ = NULL;
 	Marker* _tmp6_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_VIEW_COLLECTION (self));
 #line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_VIEW_COLLECTION (self));
+#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_set_get_count (_tmp0_);
-#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp1_ == 0) {
 #line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp1_ == 0) {
+#line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return;
 #line 5698 "ViewCollection.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 921 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	marker = _tmp2_;
 #line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	marker = _tmp2_;
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = marker;
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = view_collection_get_selected (self);
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	marker_mark_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp5_);
-#line 924 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = marker;
-#line 924 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_unselect_marked (self, _tmp6_);
-#line 917 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
 #line 5720 "ViewCollection.c"
 }
@@ -5725,13 +5725,13 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 	Marker* marker = NULL;
 	Marker* _tmp0_ = NULL;
 	Marker* _tmp15_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_DATA_VIEW (exception));
 #line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_DATA_VIEW (exception));
+#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	marker = _tmp0_;
 #line 5736 "ViewCollection.c"
 	{
@@ -5740,19 +5740,19 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 		GeeCollection* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = _tmp3_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp2_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_object_it = _tmp4_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 5757 "ViewCollection.c"
 			GeeIterator* _tmp5_ = NULL;
@@ -5765,60 +5765,60 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
 			DataView* _tmp10_ = NULL;
 			DataView* _tmp11_ = NULL;
 			DataView* _tmp12_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _object_it;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp6_) {
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 5776 "ViewCollection.c"
 			}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _object_it;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			object = (DataObject*) _tmp8_;
 #line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			object = (DataObject*) _tmp8_;
+#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = object;
-#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView));
-#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			view = _tmp10_;
 #line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			view = _tmp10_;
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = view;
-#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = exception;
-#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp11_ != _tmp12_) {
 #line 5796 "ViewCollection.c"
 				Marker* _tmp13_ = NULL;
 				DataView* _tmp14_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = marker;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = view;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
 #line 5805 "ViewCollection.c"
 			}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
 #line 5811 "ViewCollection.c"
 		}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
 #line 5815 "ViewCollection.c"
 	}
-#line 936 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp15_ = marker;
-#line 936 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_unselect_marked (self, _tmp15_);
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (marker);
 #line 5823 "ViewCollection.c"
 }
@@ -5834,59 +5834,59 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
 	DataView* _tmp7_ = NULL;
 	GObject* _tmp8_ = NULL;
 	DataView* _tmp9_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
 #line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = object;
-#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	view = _tmp1_;
 #line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	view = _tmp1_;
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = view;
-#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = data_view_is_selected (_tmp2_);
-#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp3_) {
 #line 5855 "ViewCollection.c"
 		DataSet* _tmp4_ = NULL;
 		DataView* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = self->priv->selected;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = view;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = data_set_contains (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_vala_assert (!_tmp6_, "!selected.contains(view)");
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = TRUE;
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (view);
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 5873 "ViewCollection.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp7_ = view;
-#line 947 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	data_view_internal_set_selected (_tmp7_, FALSE);
 #line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	data_view_internal_set_selected (_tmp7_, FALSE);
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp8_ = user;
-#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp9_ = view;
-#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (view);
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5891 "ViewCollection.c"
 }
@@ -5899,37 +5899,37 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
 	GeeArrayList* selected = NULL;
 	GeeArrayList* _tmp2_ = NULL;
 	Marker* _tmp3_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_MARKER (unselect));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_MARKER (select));
 #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_MARKER (select));
+#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	unselected = _tmp0_;
 #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	unselected = _tmp0_;
+#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = unselect;
-#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject));
-#line 958 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 960 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 960 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	selected = _tmp2_;
 #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	selected = _tmp2_;
+#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = select;
-#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject));
-#line 963 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 964 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 965 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 966 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (selected);
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
 #line 5934 "ViewCollection.c"
 }
@@ -5938,7 +5938,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
 static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self) {
 	gboolean result;
 	result = view_collection_toggle_item ((ViewCollection*) self, object, user);
-#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 5943 "ViewCollection.c"
 }
@@ -5952,33 +5952,33 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
 	GeeArrayList* _tmp3_ = NULL;
 	GeeArrayList* _tmp4_ = NULL;
 	GeeArrayList* _tmp5_ = NULL;
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_MARKER (marker));
 #line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_MARKER (marker));
+#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = view_collection_toggle_lists_new ();
-#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	lists = _tmp0_;
 #line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	lists = _tmp0_;
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = marker;
-#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject));
-#line 975 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = lists->selected;
-#line 975 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = lists->unselected;
-#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = lists->selected;
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = lists->unselected;
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (lists);
 #line 5983 "ViewCollection.c"
 }
@@ -5994,50 +5994,50 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 	ViewCollectionToggleLists* _tmp3_ = NULL;
 	DataView* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
 #line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = object;
-#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	view = _tmp1_;
 #line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	view = _tmp1_;
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = user;
-#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists));
-#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	lists = _tmp3_;
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = view;
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = data_view_internal_toggle (_tmp4_);
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp5_) {
 #line 6021 "ViewCollection.c"
 		DataView* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = view;
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = data_view_is_visible (_tmp6_);
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp7_) {
 #line 6030 "ViewCollection.c"
 			ViewCollectionToggleLists* _tmp8_ = NULL;
 			GeeArrayList* _tmp9_ = NULL;
 			DataView* _tmp10_ = NULL;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = lists;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = _tmp8_->selected;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = view;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
 #line 6042 "ViewCollection.c"
 		}
@@ -6045,23 +6045,23 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
 		ViewCollectionToggleLists* _tmp11_ = NULL;
 		GeeArrayList* _tmp12_ = NULL;
 		DataView* _tmp13_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp11_ = lists;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp12_ = _tmp11_->unselected;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp13_ = view;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
 #line 6056 "ViewCollection.c"
 	}
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (lists);
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (view);
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6066 "ViewCollection.c"
 }
@@ -6071,15 +6071,15 @@ gint view_collection_get_selected_count (ViewCollection* self) {
 	gint result = 0;
 	DataSet* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 999 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_set_get_count (_tmp0_);
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp1_;
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6084 "ViewCollection.c"
 }
@@ -6089,15 +6089,15 @@ GeeList* view_collection_get_selected (ViewCollection* self) {
 	GeeList* result = NULL;
 	DataSet* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_set_get_all (_tmp0_);
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6102 "ViewCollection.c"
 }
@@ -6108,17 +6108,17 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
 	DataSet* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	DataObject* _tmp2_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = index;
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6123 "ViewCollection.c"
 }
@@ -6128,35 +6128,35 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	DataSet* _tmp1_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1011 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
 #line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp1_ != NULL) {
 #line 6139 "ViewCollection.c"
 		DataSet* _tmp2_ = NULL;
 		DataView* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->visible;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = view;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = _tmp4_;
 #line 6151 "ViewCollection.c"
 	} else {
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = TRUE;
 #line 6155 "ViewCollection.c"
 	}
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6161 "ViewCollection.c"
 }
@@ -6171,51 +6171,51 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
 	DataSet* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
-#line 1015 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1015 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (GEE_IS_COLLECTION (many), FALSE);
 #line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (GEE_IS_COLLECTION (many), FALSE);
+#line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->visible;
-#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp0_ == NULL) {
 #line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp0_ == NULL) {
+#line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = TRUE;
-#line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 6186 "ViewCollection.c"
 	}
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->visible;
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = many;
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = data_set_add_many (_tmp1_, _tmp2_);
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (!_tmp3_) {
 #line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (!_tmp3_) {
+#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = FALSE;
-#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 6200 "ViewCollection.c"
 	}
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = self->priv->visible;
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = data_set_get_count (_tmp4_);
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp5_ == _tmp6_) {
 #line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp5_ == _tmp6_) {
+#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_data_set_unref0 (self->priv->visible);
-#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->visible = NULL;
 #line 6214 "ViewCollection.c"
 	}
-#line 1026 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 1026 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6220 "ViewCollection.c"
 }
@@ -6241,33 +6241,33 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 	GeeList* _tmp33_ = NULL;
 	gint _tmp34_ = 0;
 	gint _tmp35_ = 0;
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (GEE_IS_LIST (to_hide));
 #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (GEE_IS_LIST (to_hide));
+#line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	unselected = _tmp0_;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = to_hide;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp3_;
 #line 6260 "ViewCollection.c"
 	{
 		gint ctr = 0;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
 #line 6265 "ViewCollection.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = TRUE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
 #line 6272 "ViewCollection.c"
 				gint _tmp6_ = 0;
@@ -6281,155 +6281,155 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 				DataView* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				DataView* _tmp21_ = NULL;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp4_) {
 #line 6286 "ViewCollection.c"
 					gint _tmp5_ = 0;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp5_ = ctr;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp5_ + 1;
 #line 6292 "ViewCollection.c"
 				}
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp4_ = FALSE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp6_ = ctr;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp7_ = count;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!(_tmp6_ < _tmp7_)) {
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
 #line 6304 "ViewCollection.c"
 				}
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = to_hide;
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = ctr;
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-				view = (DataView*) _tmp10_;
 #line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+				view = (DataView*) _tmp10_;
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp11_ = view;
-#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = data_view_is_visible (_tmp11_);
-#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_vala_assert (_tmp12_, "view.is_visible()");
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = view;
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = data_view_is_selected (_tmp13_);
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp14_) {
 #line 6326 "ViewCollection.c"
 					DataView* _tmp15_ = NULL;
 					GeeArrayList* _tmp16_ = NULL;
 					DataView* _tmp17_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp15_ = view;
-#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					data_view_internal_set_selected (_tmp15_, FALSE);
 #line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+					data_view_internal_set_selected (_tmp15_, FALSE);
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp16_ = unselected;
-#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = view;
-#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 6340 "ViewCollection.c"
 				} else {
 					DataSet* _tmp18_ = NULL;
 					DataView* _tmp19_ = NULL;
 					gboolean _tmp20_ = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp18_ = self->priv->selected;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp19_ = view;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_vala_assert (!_tmp20_, "!selected.contains(view)");
 #line 6353 "ViewCollection.c"
 				}
-#line 1045 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp21_ = view;
-#line 1045 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				data_view_internal_set_visible (_tmp21_, FALSE);
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
 #line 6361 "ViewCollection.c"
 			}
 		}
 	}
-#line 1048 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp22_ = self->priv->visible;
-#line 1048 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp22_ == NULL) {
 #line 6369 "ViewCollection.c"
 		DataSet* _tmp23_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp23_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_data_set_unref0 (self->priv->visible);
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->visible = _tmp23_;
 #line 6377 "ViewCollection.c"
 	}
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp24_ = self->priv->visible;
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp25_ = to_hide;
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp26_ = data_set_remove_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	removed = _tmp26_;
 #line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	removed = _tmp26_;
+#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp27_ = removed;
-#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp27_, "removed");
-#line 1056 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp28_ = unselected;
-#line 1056 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp29_ = unselected;
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp31_ = _tmp30_;
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp31_ > 0) {
 #line 6403 "ViewCollection.c"
 		GeeArrayList* _tmp32_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp32_ = unselected;
-#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 6409 "ViewCollection.c"
 	}
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp33_ = to_hide;
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp35_ = _tmp34_;
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp35_ > 0) {
 #line 6419 "ViewCollection.c"
 		GeeList* _tmp36_ = NULL;
 		GeeList* _tmp37_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp36_ = to_hide;
-#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp37_ = to_hide;
-#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 6430 "ViewCollection.c"
 	}
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (unselected);
 #line 6434 "ViewCollection.c"
 }
@@ -6450,33 +6450,33 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 	GeeList* _tmp25_ = NULL;
 	gint _tmp26_ = 0;
 	gint _tmp27_ = 0;
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (GEE_IS_LIST (to_show));
 #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (GEE_IS_LIST (to_show));
+#line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	added_selected = _tmp0_;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = to_show;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _tmp2_;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp3_;
 #line 6469 "ViewCollection.c"
 	{
 		gint ctr = 0;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
 #line 6474 "ViewCollection.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = TRUE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
 #line 6481 "ViewCollection.c"
 				gint _tmp6_ = 0;
@@ -6490,51 +6490,51 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 				DataView* _tmp13_ = NULL;
 				DataView* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp4_) {
 #line 6495 "ViewCollection.c"
 					gint _tmp5_ = 0;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp5_ = ctr;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp5_ + 1;
 #line 6501 "ViewCollection.c"
 				}
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp4_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp6_ = ctr;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp7_ = count;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!(_tmp6_ < _tmp7_)) {
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
 #line 6513 "ViewCollection.c"
 				}
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = to_show;
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = ctr;
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-				view = (DataView*) _tmp10_;
 #line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+				view = (DataView*) _tmp10_;
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp11_ = view;
-#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = data_view_is_visible (_tmp11_);
-#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_vala_assert (!_tmp12_, "!view.is_visible()");
-#line 1076 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = view;
-#line 1076 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				data_view_internal_set_visible (_tmp13_, TRUE);
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = view;
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp15_ = data_view_is_selected (_tmp14_);
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp15_) {
 #line 6539 "ViewCollection.c"
 					DataSet* _tmp16_ = NULL;
@@ -6542,64 +6542,64 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 					gboolean _tmp18_ = FALSE;
 					GeeArrayList* _tmp19_ = NULL;
 					DataView* _tmp20_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp16_ = self->priv->selected;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = view;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp18_ = data_set_contains (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject));
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_vala_assert (!_tmp18_, "!selected.contains(view)");
 #line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+					_vala_assert (!_tmp18_, "!selected.contains(view)");
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp19_ = added_selected;
-#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp20_ = view;
-#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
 #line 6559 "ViewCollection.c"
 				}
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
 #line 6563 "ViewCollection.c"
 			}
 		}
 	}
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp21_ = to_show;
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp22_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	added = _tmp22_;
 #line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	added = _tmp22_;
+#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp23_ = added;
-#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp23_, "added");
-#line 1088 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp24_ = added_selected;
-#line 1088 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp25_ = to_show;
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp27_ = _tmp26_;
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp27_ > 0) {
 #line 6589 "ViewCollection.c"
 		GeeList* _tmp28_ = NULL;
 		GeeList* _tmp29_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp28_ = to_show;
-#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp29_ = to_show;
-#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 6600 "ViewCollection.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (added_selected);
 #line 6604 "ViewCollection.c"
 }
@@ -6611,23 +6611,23 @@ gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource*
 	DataView* _tmp1_ = NULL;
 	DataView* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1097 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = source;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _tmp2_ != NULL;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp3_;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6632 "ViewCollection.c"
 }
@@ -6638,19 +6638,19 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
 	GeeHashMap* _tmp0_ = NULL;
 	DataSource* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 1102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->source_map;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = source;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = (DataView*) _tmp2_;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6655 "ViewCollection.c"
 }
@@ -6662,23 +6662,23 @@ gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self
 	DataView* _tmp1_ = NULL;
 	DataView* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1107 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1107 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = source;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_view_for_source_filtered (self, _tmp0_);
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _tmp2_ != NULL;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp3_;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6683 "ViewCollection.c"
 }
@@ -6692,50 +6692,50 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
 	gpointer _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	DataView* _tmp4_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 1112 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->source_map;
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = source;
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view = (DataView*) _tmp2_;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = view;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp4_ != NULL) {
 #line 6711 "ViewCollection.c"
 		DataView* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = view;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = view_collection_is_in_filter (self, _tmp5_);
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = !_tmp6_;
 #line 6720 "ViewCollection.c"
 	} else {
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = FALSE;
 #line 6724 "ViewCollection.c"
 	}
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	if (_tmp3_) {
 #line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	if (_tmp3_) {
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		result = NULL;
-#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (view);
-#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return result;
 #line 6734 "ViewCollection.c"
 	}
-#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = view;
-#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6740 "ViewCollection.c"
 }
@@ -6750,27 +6750,27 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
 	GeeSet* _tmp4_ = NULL;
 	GeeSet* _tmp5_ = NULL;
 	GeeCollection* _tmp6_ = NULL;
-#line 1121 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->source_map;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = _tmp2_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = gee_set_get_read_only_view (_tmp3_);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp6_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6775 "ViewCollection.c"
 }
@@ -6780,13 +6780,13 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 	gboolean result = FALSE;
 	GType _tmp0_ = 0UL;
 	gboolean _tmp1_ = FALSE;
-#line 1126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = t;
-#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
 #line 6791 "ViewCollection.c"
 	{
@@ -6797,23 +6797,23 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 		GeeSet* _tmp5_ = NULL;
 		GeeIterator* _tmp6_ = NULL;
 		GeeIterator* _tmp7_ = NULL;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = self->priv->source_map;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = _tmp3_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = _tmp4_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = _tmp6_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_source_it = _tmp7_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 6818 "ViewCollection.c"
 			GeeIterator* _tmp8_ = NULL;
@@ -6825,53 +6825,53 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 			GType _tmp13_ = 0UL;
 			GType _tmp14_ = 0UL;
 			gboolean _tmp15_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _source_it;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp9_) {
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 6836 "ViewCollection.c"
 			}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = _source_it;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			source = (DataSource*) _tmp11_;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			source = (DataSource*) _tmp11_;
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = source;
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = t;
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			if (_tmp15_) {
 #line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			if (_tmp15_) {
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				result = TRUE;
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (source);
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_source_it);
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				return result;
 #line 6862 "ViewCollection.c"
 			}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
 #line 6866 "ViewCollection.c"
 		}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_source_it);
 #line 6870 "ViewCollection.c"
 	}
-#line 1134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = FALSE;
-#line 1134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6876 "ViewCollection.c"
 }
@@ -6882,15 +6882,15 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 	GType _tmp0_ = 0UL;
 	gboolean _tmp1_ = FALSE;
 	gint count = 0;
-#line 1137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
 #line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = t;
-#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 1140 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = 0;
 #line 6895 "ViewCollection.c"
 	{
@@ -6899,19 +6899,19 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = _tmp4_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_object_it = _tmp5_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 6916 "ViewCollection.c"
 			GeeIterator* _tmp6_ = NULL;
@@ -6926,59 +6926,59 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
 			GType _tmp14_ = 0UL;
 			gboolean _tmp15_ = FALSE;
 			gboolean _tmp16_ = FALSE;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp7_) {
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 6937 "ViewCollection.c"
 			}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			object = (DataObject*) _tmp9_;
 #line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			object = (DataObject*) _tmp9_;
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = object;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = _tmp11_;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = t;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp16_ = _tmp15_;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp16_) {
 #line 6963 "ViewCollection.c"
 				gint _tmp17_ = 0;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp17_ = count;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				count = _tmp17_ + 1;
 #line 6969 "ViewCollection.c"
 			}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
 #line 6973 "ViewCollection.c"
 		}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
 #line 6977 "ViewCollection.c"
 	}
-#line 1146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = count;
-#line 1146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 6983 "ViewCollection.c"
 }
@@ -6989,15 +6989,15 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 	GType _tmp0_ = 0UL;
 	gboolean _tmp1_ = FALSE;
 	GeeList* sources = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = t;
-#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 1152 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = NULL;
 #line 7002 "ViewCollection.c"
 	{
@@ -7006,19 +7006,19 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = _tmp2_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = _tmp4_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_object_it = _tmp5_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 7023 "ViewCollection.c"
 			GeeIterator* _tmp6_ = NULL;
@@ -7033,77 +7033,77 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 			GType _tmp13_ = 0UL;
 			GType _tmp14_ = 0UL;
 			gboolean _tmp15_ = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _object_it;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!_tmp7_) {
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 7044 "ViewCollection.c"
 			}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _object_it;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			object = (DataObject*) _tmp9_;
 #line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			object = (DataObject*) _tmp9_;
+#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = object;
-#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			source = _tmp11_;
 #line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			source = _tmp11_;
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = source;
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = t;
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp15_) {
 #line 7068 "ViewCollection.c"
 				GeeList* _tmp16_ = NULL;
 				GeeList* _tmp18_ = NULL;
 				DataSource* _tmp19_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = sources;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp16_ == NULL) {
 #line 7076 "ViewCollection.c"
 					GeeArrayList* _tmp17_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (sources);
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
 #line 7084 "ViewCollection.c"
 				}
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = sources;
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp19_ = source;
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
 #line 7092 "ViewCollection.c"
 			}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (object);
 #line 7098 "ViewCollection.c"
 		}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_object_it);
 #line 7102 "ViewCollection.c"
 	}
-#line 1163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = sources;
-#line 1163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7108 "ViewCollection.c"
 }
@@ -7116,29 +7116,29 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 	gint count = 0;
 	DataSet* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1166 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = self->priv->selected;
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_set_get_count (_tmp1_);
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	count = _tmp2_;
 #line 7131 "ViewCollection.c"
 	{
 		gint ctr = 0;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		ctr = 0;
 #line 7136 "ViewCollection.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp3_ = TRUE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
 #line 7143 "ViewCollection.c"
 				gint _tmp5_ = 0;
@@ -7150,55 +7150,55 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 				DataView* _tmp11_ = NULL;
 				DataSource* _tmp12_ = NULL;
 				DataSource* _tmp13_ = NULL;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp3_) {
 #line 7155 "ViewCollection.c"
 					gint _tmp4_ = 0;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp4_ = ctr;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					ctr = _tmp4_ + 1;
 #line 7161 "ViewCollection.c"
 				}
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp3_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp5_ = ctr;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp6_ = count;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!(_tmp5_ < _tmp6_)) {
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
 #line 7173 "ViewCollection.c"
 				}
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp7_ = sources;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp8_ = self->priv->selected;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp9_ = ctr;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp10_ = data_set_get_at (_tmp8_, _tmp9_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = data_view_get_source (_tmp11_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = _tmp12_;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp13_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (_tmp11_);
 #line 7195 "ViewCollection.c"
 			}
 		}
 	}
-#line 1173 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = sources;
-#line 1173 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7203 "ViewCollection.c"
 }
@@ -7212,44 +7212,44 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
 	DataObject* _tmp2_ = NULL;
 	DataSource* _tmp3_ = NULL;
 	DataObject* _tmp4_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->selected;
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = index;
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	object = _tmp2_;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp4_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp4_ != NULL) {
 #line 7229 "ViewCollection.c"
 		DataObject* _tmp5_ = NULL;
 		DataSource* _tmp6_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView));
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = _tmp6_;
 #line 7240 "ViewCollection.c"
 	} else {
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = NULL;
 #line 7246 "ViewCollection.c"
 	}
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp3_;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (object);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7254 "ViewCollection.c"
 }
@@ -7258,9 +7258,9 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t) {
 	GeeList* result = NULL;
 	GeeList* sources = NULL;
-#line 1182 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
 #line 1183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = NULL;
 #line 7265 "ViewCollection.c"
 	{
@@ -7271,21 +7271,21 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _view_index = 0;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp0_ = view_collection_get_selected (self);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_view_list = _tmp0_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = _view_list;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = _tmp2_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_view_size = _tmp3_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_view_index = -1;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		while (TRUE) {
 #line 7290 "ViewCollection.c"
 			gint _tmp4_ = 0;
@@ -7302,83 +7302,83 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 			GType _tmp13_ = 0UL;
 			GType _tmp14_ = 0UL;
 			gboolean _tmp15_ = FALSE;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp4_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_view_index = _tmp4_ + 1;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp5_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = _view_size;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (!(_tmp5_ < _tmp6_)) {
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				break;
 #line 7317 "ViewCollection.c"
 			}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp7_ = _view_list;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp8_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp9_ = gee_list_get (_tmp7_, _tmp8_);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			view = (DataView*) _tmp9_;
 #line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			view = (DataView*) _tmp9_;
+#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = view;
-#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = data_view_get_source (_tmp10_);
-#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			source = _tmp11_;
 #line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+			source = _tmp11_;
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp12_ = source;
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp14_ = t;
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			if (_tmp15_) {
 #line 7343 "ViewCollection.c"
 				GeeList* _tmp16_ = NULL;
 				GeeList* _tmp18_ = NULL;
 				DataSource* _tmp19_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = sources;
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (_tmp16_ == NULL) {
 #line 7351 "ViewCollection.c"
 					GeeArrayList* _tmp17_ = NULL;
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					_g_object_unref0 (sources);
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
 #line 7359 "ViewCollection.c"
 				}
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp18_ = sources;
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp19_ = source;
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
 #line 7367 "ViewCollection.c"
 			}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (source);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (view);
 #line 7373 "ViewCollection.c"
 		}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_view_list);
 #line 7377 "ViewCollection.c"
 	}
-#line 1194 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = sources;
-#line 1194 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7383 "ViewCollection.c"
 }
@@ -7391,40 +7391,40 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
 	DataView* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	DataView* _tmp3_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
-#line 1198 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), 0);
 #line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), 0);
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = source;
-#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view = _tmp1_;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = view;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp3_ != NULL) {
 #line 7408 "ViewCollection.c"
 		DataView* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = view;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = _tmp5_;
 #line 7417 "ViewCollection.c"
 	} else {
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = -1;
 #line 7421 "ViewCollection.c"
 	}
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp2_;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_g_object_unref0 (view);
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7429 "ViewCollection.c"
 }
@@ -7432,57 +7432,57 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
 
 void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) {
 	gboolean _tmp0_ = FALSE;
-#line 1205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_DATA_VIEW (view));
 #line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_DATA_VIEW (view));
+#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp0_) {
 #line 7443 "ViewCollection.c"
 		DataView* _tmp1_ = NULL;
 		DataView* _tmp2_ = NULL;
 		GeeCollection* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = view;
-#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_item_view_altered (self, _tmp1_);
 #line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_item_view_altered (self, _tmp1_);
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = view;
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_views_altered (self, _tmp4_);
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp4_);
 #line 7462 "ViewCollection.c"
 	} else {
 		GeeHashSet* _tmp5_ = NULL;
 		GeeHashSet* _tmp7_ = NULL;
 		DataView* _tmp8_ = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = self->priv->frozen_views_altered;
-#line 1210 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_ == NULL) {
 #line 7471 "ViewCollection.c"
 			GeeHashSet* _tmp6_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (self->priv->frozen_views_altered);
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			self->priv->frozen_views_altered = _tmp6_;
 #line 7479 "ViewCollection.c"
 		}
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = self->priv->frozen_views_altered;
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = view;
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
 #line 7487 "ViewCollection.c"
 	}
@@ -7491,57 +7491,57 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
 
 void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) {
 	gboolean _tmp0_ = FALSE;
-#line 1217 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1217 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_if_fail (IS_DATA_VIEW (view));
 #line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_if_fail (IS_DATA_VIEW (view));
+#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!_tmp0_) {
 #line 7502 "ViewCollection.c"
 		DataView* _tmp1_ = NULL;
 		DataView* _tmp2_ = NULL;
 		GeeCollection* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp1_ = view;
-#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_item_geometry_altered (self, _tmp1_);
 #line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_item_geometry_altered (self, _tmp1_);
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp2_ = view;
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_collection_notify_geometries_altered (self, _tmp4_);
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (_tmp4_);
 #line 7521 "ViewCollection.c"
 	} else {
 		GeeHashSet* _tmp5_ = NULL;
 		GeeHashSet* _tmp7_ = NULL;
 		DataView* _tmp8_ = NULL;
-#line 1222 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp5_ = self->priv->frozen_geometries_altered;
-#line 1222 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (_tmp5_ == NULL) {
 #line 7530 "ViewCollection.c"
 			GeeHashSet* _tmp6_ = NULL;
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (self->priv->frozen_geometries_altered);
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			self->priv->frozen_geometries_altered = _tmp6_;
 #line 7538 "ViewCollection.c"
 		}
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp7_ = self->priv->frozen_geometries_altered;
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = view;
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
 #line 7546 "ViewCollection.c"
 	}
@@ -7552,11 +7552,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 	ViewCollection * self;
 	GeeHashSet* _tmp0_ = NULL;
 	GeeHashSet* _tmp9_ = NULL;
-#line 1228 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
 #line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->frozen_views_altered;
-#line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp0_ != NULL) {
 #line 7561 "ViewCollection.c"
 		GeeHashSet* _tmp8_ = NULL;
@@ -7564,13 +7564,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 			GeeIterator* _view_it = NULL;
 			GeeHashSet* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp1_ = self->priv->frozen_views_altered;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_view_it = _tmp2_;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
 #line 7575 "ViewCollection.c"
 				GeeIterator* _tmp3_ = NULL;
@@ -7579,47 +7579,47 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				GeeIterator* _tmp5_ = NULL;
 				gpointer _tmp6_ = NULL;
 				DataView* _tmp7_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp3_ = _view_it;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp4_) {
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
 #line 7590 "ViewCollection.c"
 				}
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp5_ = _view_it;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-				view = (DataView*) _tmp6_;
 #line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+				view = (DataView*) _tmp6_;
+#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp7_ = view;
-#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				view_collection_notify_item_view_altered (self, _tmp7_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
 #line 7604 "ViewCollection.c"
 			}
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_view_it);
 #line 7608 "ViewCollection.c"
 		}
-#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp8_ = self->priv->frozen_views_altered;
-#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (self->priv->frozen_views_altered);
-#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->frozen_views_altered = NULL;
 #line 7618 "ViewCollection.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp9_ = self->priv->frozen_geometries_altered;
-#line 1236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (_tmp9_ != NULL) {
 #line 7624 "ViewCollection.c"
 		GeeHashSet* _tmp17_ = NULL;
@@ -7627,13 +7627,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 			GeeIterator* _view_it = NULL;
 			GeeHashSet* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp10_ = self->priv->frozen_geometries_altered;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_view_it = _tmp11_;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			while (TRUE) {
 #line 7638 "ViewCollection.c"
 				GeeIterator* _tmp12_ = NULL;
@@ -7642,45 +7642,45 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
 				GeeIterator* _tmp14_ = NULL;
 				gpointer _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp12_ = _view_it;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				if (!_tmp13_) {
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 					break;
 #line 7653 "ViewCollection.c"
 				}
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp14_ = _view_it;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-				view = (DataView*) _tmp15_;
 #line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+				view = (DataView*) _tmp15_;
+#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_tmp16_ = view;
-#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				view_collection_notify_item_geometry_altered (self, _tmp16_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 				_g_object_unref0 (view);
 #line 7667 "ViewCollection.c"
 			}
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_g_object_unref0 (_view_it);
 #line 7671 "ViewCollection.c"
 		}
-#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp17_ = self->priv->frozen_geometries_altered;
-#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+		view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_g_object_unref0 (self->priv->frozen_geometries_altered);
-#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		self->priv->frozen_geometries_altered = NULL;
 #line 7681 "ViewCollection.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1244 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_thawed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
 #line 7685 "ViewCollection.c"
 }
@@ -7690,15 +7690,15 @@ gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
 	gboolean result = FALSE;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1246 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
 #line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = _tmp0_ != _tmp1_;
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 7703 "ViewCollection.c"
 }
@@ -8558,38 +8558,38 @@ GType view_collection_get_type (void) {
 
 static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source) {
 	gboolean result = FALSE;
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	result = TRUE;
-#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return result;
 #line 8567 "ViewCollection.c"
 }
 
 
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) {
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE);
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source);
 #line 8576 "ViewCollection.c"
 }
 
 
 static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source) {
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_critical ("Type `%s' does not implement abstract method `view_manager_create_view'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
 #line 8585 "ViewCollection.c"
 }
 
 
 DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL);
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source);
 #line 8594 "ViewCollection.c"
 }
@@ -8597,25 +8597,25 @@ DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
 
 ViewManager* view_manager_construct (GType object_type) {
 	ViewManager* self = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = (ViewManager*) g_type_create_instance (object_type);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
 #line 8604 "ViewCollection.c"
 }
 
 
 static void value_view_manager_init (GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	value->data[0].v_pointer = NULL;
 #line 8611 "ViewCollection.c"
 }
 
 
 static void value_view_manager_free_value (GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (value->data[0].v_pointer);
 #line 8620 "ViewCollection.c"
 	}
@@ -8623,13 +8623,13 @@ static void value_view_manager_free_value (GValue* value) {
 
 
 static void value_view_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = view_manager_ref (src_value->data[0].v_pointer);
 #line 8630 "ViewCollection.c"
 	} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 8634 "ViewCollection.c"
 	}
@@ -8637,37 +8637,37 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
 
 
 static gpointer value_view_manager_peek_pointer (const GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
 #line 8642 "ViewCollection.c"
 }
 
 
 static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (collect_values[0].v_pointer) {
 #line 8649 "ViewCollection.c"
 		ViewManager* object;
 		object = collect_values[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 8656 "ViewCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 8660 "ViewCollection.c"
 		}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_manager_ref (object);
 #line 8664 "ViewCollection.c"
 	} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 8668 "ViewCollection.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
 #line 8672 "ViewCollection.c"
 }
@@ -8676,27 +8676,27 @@ static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_v
 static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ViewManager** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!object_p) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 8683 "ViewCollection.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = NULL;
 #line 8689 "ViewCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = value->data[0].v_pointer;
 #line 8693 "ViewCollection.c"
 	} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_manager_ref (value->data[0].v_pointer);
 #line 8697 "ViewCollection.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
 #line 8701 "ViewCollection.c"
 }
@@ -8704,22 +8704,22 @@ static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_colle
 
 GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecViewManager* spec;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_MANAGER), NULL);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return G_PARAM_SPEC (spec);
 #line 8715 "ViewCollection.c"
 }
 
 
 gpointer value_get_view_manager (const GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER), NULL);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
 #line 8724 "ViewCollection.c"
 }
@@ -8727,29 +8727,29 @@ gpointer value_get_view_manager (const GValue* value) {
 
 void value_set_view_manager (GValue* value, gpointer v_object) {
 	ViewManager* old;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	old = value->data[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (v_object) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_ref (value->data[0].v_pointer);
 #line 8744 "ViewCollection.c"
 	} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 8748 "ViewCollection.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (old);
 #line 8754 "ViewCollection.c"
 	}
@@ -8758,27 +8758,27 @@ void value_set_view_manager (GValue* value, gpointer v_object) {
 
 void value_take_view_manager (GValue* value, gpointer v_object) {
 	ViewManager* old;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	old = value->data[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (v_object) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
 #line 8773 "ViewCollection.c"
 	} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 8777 "ViewCollection.c"
 	}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_manager_unref (old);
 #line 8783 "ViewCollection.c"
 	}
@@ -8786,20 +8786,20 @@ void value_take_view_manager (GValue* value, gpointer v_object) {
 
 
 static void view_manager_class_init (ViewManagerClass * klass) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewManagerClass *) klass)->finalize = view_manager_finalize;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewManagerClass *) klass)->include_in_view = view_manager_real_include_in_view;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewManagerClass *) klass)->create_view = view_manager_real_create_view;
 #line 8797 "ViewCollection.c"
 }
 
 
 static void view_manager_instance_init (ViewManager * self) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->ref_count = 1;
 #line 8804 "ViewCollection.c"
 }
@@ -8807,9 +8807,9 @@ static void view_manager_instance_init (ViewManager * self) {
 
 static void view_manager_finalize (ViewManager* obj) {
 	ViewManager * self;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_handlers_destroy (self);
 #line 8814 "ViewCollection.c"
 }
@@ -8832,9 +8832,9 @@ GType view_manager_get_type (void) {
 gpointer view_manager_ref (gpointer instance) {
 	ViewManager* self;
 	self = instance;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
 #line 8839 "ViewCollection.c"
 }
@@ -8843,11 +8843,11 @@ gpointer view_manager_ref (gpointer instance) {
 void view_manager_unref (gpointer instance) {
 	ViewManager* self;
 	self = instance;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		VIEW_MANAGER_GET_CLASS (self)->finalize (self);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 8852 "ViewCollection.c"
 	}
@@ -8855,18 +8855,18 @@ void view_manager_unref (gpointer instance) {
 
 
 static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return FALSE;
 #line 8862 "ViewCollection.c"
 }
 
 
 gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE);
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return VIEW_FILTER_GET_CLASS (self)->predicate (self, view);
 #line 8871 "ViewCollection.c"
 }
@@ -8874,9 +8874,9 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
 
 ViewFilter* view_filter_construct (GType object_type) {
 	ViewFilter* self = NULL;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = (ViewFilter*) g_type_create_instance (object_type);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return self;
 #line 8881 "ViewCollection.c"
 }
@@ -8887,16 +8887,16 @@ static void view_filter_real_refresh (ViewFilter* self) {
 
 
 static void value_view_filter_init (GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	value->data[0].v_pointer = NULL;
 #line 8892 "ViewCollection.c"
 }
 
 
 static void value_view_filter_free_value (GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (value->data[0].v_pointer);
 #line 8901 "ViewCollection.c"
 	}
@@ -8904,13 +8904,13 @@ static void value_view_filter_free_value (GValue* value) {
 
 
 static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer);
 #line 8911 "ViewCollection.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 8915 "ViewCollection.c"
 	}
@@ -8918,37 +8918,37 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
 
 
 static gpointer value_view_filter_peek_pointer (const GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
 #line 8923 "ViewCollection.c"
 }
 
 
 static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (collect_values[0].v_pointer) {
 #line 8930 "ViewCollection.c"
 		ViewFilter* object;
 		object = collect_values[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 8937 "ViewCollection.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 8941 "ViewCollection.c"
 		}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_filter_ref (object);
 #line 8945 "ViewCollection.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 8949 "ViewCollection.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
 #line 8953 "ViewCollection.c"
 }
@@ -8957,27 +8957,27 @@ static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_va
 static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ViewFilter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!object_p) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 8964 "ViewCollection.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (!value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = NULL;
 #line 8970 "ViewCollection.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = value->data[0].v_pointer;
 #line 8974 "ViewCollection.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_filter_ref (value->data[0].v_pointer);
 #line 8978 "ViewCollection.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
 #line 8982 "ViewCollection.c"
 }
@@ -8985,22 +8985,22 @@ static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collec
 
 GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecViewFilter* spec;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_FILTER), NULL);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return G_PARAM_SPEC (spec);
 #line 8996 "ViewCollection.c"
 }
 
 
 gpointer value_get_view_filter (const GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return value->data[0].v_pointer;
 #line 9005 "ViewCollection.c"
 }
@@ -9008,29 +9008,29 @@ gpointer value_get_view_filter (const GValue* value) {
 
 void value_set_view_filter (GValue* value, gpointer v_object) {
 	ViewFilter* old;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	old = value->data[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (v_object) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_ref (value->data[0].v_pointer);
 #line 9025 "ViewCollection.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 9029 "ViewCollection.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (old);
 #line 9035 "ViewCollection.c"
 	}
@@ -9039,27 +9039,27 @@ void value_set_view_filter (GValue* value, gpointer v_object) {
 
 void value_take_view_filter (GValue* value, gpointer v_object) {
 	ViewFilter* old;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	old = value->data[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (v_object) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = v_object;
 #line 9054 "ViewCollection.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
 #line 9058 "ViewCollection.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (old) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		view_filter_unref (old);
 #line 9064 "ViewCollection.c"
 	}
@@ -9067,22 +9067,22 @@ void value_take_view_filter (GValue* value, gpointer v_object) {
 
 
 static void view_filter_class_init (ViewFilterClass * klass) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewFilterClass *) klass)->finalize = view_filter_finalize;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewFilterClass *) klass)->predicate = view_filter_real_predicate;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	((ViewFilterClass *) klass)->refresh = view_filter_real_refresh;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 9080 "ViewCollection.c"
 }
 
 
 static void view_filter_instance_init (ViewFilter * self) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->ref_count = 1;
 #line 9087 "ViewCollection.c"
 }
@@ -9090,9 +9090,9 @@ static void view_filter_instance_init (ViewFilter * self) {
 
 static void view_filter_finalize (ViewFilter* obj) {
 	ViewFilter * self;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_signal_handlers_destroy (self);
 #line 9097 "ViewCollection.c"
 }
@@ -9115,9 +9115,9 @@ GType view_filter_get_type (void) {
 gpointer view_filter_ref (gpointer instance) {
 	ViewFilter* self;
 	self = instance;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
 #line 9122 "ViewCollection.c"
 }
@@ -9126,11 +9126,11 @@ gpointer view_filter_ref (gpointer instance) {
 void view_filter_unref (gpointer instance) {
 	ViewFilter* self;
 	self = instance;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		VIEW_FILTER_GET_CLASS (self)->finalize (self);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 9135 "ViewCollection.c"
 	}
diff --git a/src/core/ViewCollection.vala b/src/core/ViewCollection.vala
index ce6fcaf..7e13fb0 100644
--- a/src/core/ViewCollection.vala
+++ b/src/core/ViewCollection.vala
@@ -646,7 +646,8 @@ public class ViewCollection : DataCollection {
     }
     
     public override void items_altered(Gee.Map<DataObject, Alteration> map) {
-        filter_altered_items(map.keys);
+        // Cast - our DataObjects are DataViews.
+        filter_altered_items((Gee.Collection<DataView>)map.keys);
 
         base.items_altered(map);
     }
diff --git a/src/core/util.c b/src/core/util.c
index 0088011..927d070 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.32.1, the Vala compiler
+/* util.c generated by valac 0.34.1, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
commit	694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree	c098b2104f1b76db60dd1f50de060c4439437fd8 /src/core
parent	6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent	b076314018e4b53d745823754a26eb6fb73a2801 (diff)