Merge branch 'feature/upstream' into develop

1 files changed, 332 insertions, 301 deletions

diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index 192d771..b61808a 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.36.6, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.40.4, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -257,86 +258,145 @@ GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 GType marker_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
 gpointer source_backlink_ref (gpointer instance);
 void source_backlink_unref (gpointer instance);
-GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_backlink (GValue* value, gpointer v_object);
-void value_take_source_backlink (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_backlink (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_source_backlink (GValue* value,
+                                gpointer v_object);
+void value_take_source_backlink (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_source_backlink (const GValue* value);
 GType source_backlink_get_type (void) G_GNUC_CONST;
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 #define DATABASE_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionPrivate))
-enum  {
-	DATABASE_SOURCE_COLLECTION_DUMMY_PROPERTY
-};
 guint int64_hash (gint64* n);
-static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self);
-gboolean int64_equal (gint64* a, gint64* b);
-static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static guint _int64_hash_gee_hash_data_func (gconstpointer v,
+                                      gpointer self);
+gboolean int64_equal (gint64* a,
+                      gint64* b);
+static gboolean _int64_equal_gee_equal_data_func (gconstpointer a,
+                                           gconstpointer b,
+                                           gpointer self);
 static gint64* _int64_dup (gint64* self);
-DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target);
-SourceCollection* source_collection_construct (GType object_type, const gchar* name);
-static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added);
-void data_collection_notify_items_added (DataCollection* self, GeeIterable* added);
-static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed);
-void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed);
-DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key);
+DatabaseSourceCollection* database_source_collection_construct (GType object_type,
+                                                                const gchar* name,
+                                                                GetSourceDatabaseKey source_key_func,
+                                                                void* source_key_func_target);
+SourceCollection* source_collection_construct (GType object_type,
+                                               const gchar* name);
+static void database_source_collection_real_notify_items_added (DataCollection* base,
+                                                         GeeIterable* added);
+void data_collection_notify_items_added (DataCollection* self,
+                                         GeeIterable* added);
+static void database_source_collection_real_notify_items_removed (DataCollection* base,
+                                                           GeeIterable* removed);
+void data_collection_notify_items_removed (DataCollection* self,
+                                           GeeIterable* removed);
+DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self,
+                                                     gint64 key);
 static void database_source_collection_finalize (DataCollection * obj);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+                                    gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_source_holding_tank (const GValue* value);
 GType source_holding_tank_get_type (void) G_GNUC_CONST;
 GType database_source_holding_tank_get_type (void) G_GNUC_CONST;
 #define DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTankPrivate))
-enum  {
-	DATABASE_SOURCE_HOLDING_TANK_DUMMY_PROPERTY
-};
-DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target);
-DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target);
-SourceHoldingTank* source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target);
-SourceHoldingTank* source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target);
-DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id);
-static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed);
-void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
+DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources,
+                                                             SourceHoldingTankCheckToKeep check_to_keep,
+                                                             void* check_to_keep_target,
+                                                             GetSourceDatabaseKey get_key,
+                                                             void* get_key_target);
+DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type,
+                                                                   SourceCollection* sources,
+                                                                   SourceHoldingTankCheckToKeep check_to_keep,
+                                                                   void* check_to_keep_target,
+                                                                   GetSourceDatabaseKey get_key,
+                                                                   void* get_key_target);
+SourceHoldingTank* source_holding_tank_new (SourceCollection* sources,
+                                            SourceHoldingTankCheckToKeep check_to_keep,
+                                            void* check_to_keep_target);
+SourceHoldingTank* source_holding_tank_construct (GType object_type,
+                                                  SourceCollection* sources,
+                                                  SourceHoldingTankCheckToKeep check_to_keep,
+                                                  void* check_to_keep_target);
+DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self,
+                                                    gint64 id);
+static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base,
+                                                                GeeCollection* added,
+                                                                GeeCollection* removed);
+void source_holding_tank_notify_contents_altered (SourceHoldingTank* self,
+                                                  GeeCollection* added,
+                                                  GeeCollection* removed);
 static void database_source_holding_tank_finalize (SourceHoldingTank * obj);
 
 
-static guint _int64_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
+static guint
+_int64_hash_gee_hash_data_func (gconstpointer v,
+                                gpointer self)
+{
 	guint result;
 	result = int64_hash ((gint64*) v);
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return result;
-#line 327 "DatabaseSourceCollection.c"
+#line 381 "DatabaseSourceCollection.c"
 }
 
 
-static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gboolean
+_int64_equal_gee_equal_data_func (gconstpointer a,
+                                  gconstpointer b,
+                                  gpointer self)
+{
 	gboolean result;
 	result = int64_equal ((gint64*) a, (gint64*) b);
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return result;
-#line 336 "DatabaseSourceCollection.c"
+#line 394 "DatabaseSourceCollection.c"
 }
 
 
-static gint64* _int64_dup (gint64* self) {
+static gint64*
+_int64_dup (gint64* self)
+{
 	gint64* dup;
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	dup = g_new0 (gint64, 1);
@@ -344,260 +404,239 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return dup;
-#line 348 "DatabaseSourceCollection.c"
+#line 408 "DatabaseSourceCollection.c"
 }
 
 
-DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) {
+DatabaseSourceCollection*
+database_source_collection_construct (GType object_type,
+                                      const gchar* name,
+                                      GetSourceDatabaseKey source_key_func,
+                                      void* source_key_func_target)
+{
 	DatabaseSourceCollection* self = NULL;
-	const gchar* _tmp0_;
-	GetSourceDatabaseKey _tmp1_;
-	void* _tmp1__target;
 #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp0_ = name;
-#line 21 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self = (DatabaseSourceCollection*) source_collection_construct (object_type, _tmp0_);
+	self = (DatabaseSourceCollection*) source_collection_construct (object_type, name);
 #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1_ = source_key_func;
+	self->priv->source_key_func = source_key_func;
 #line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1__target = source_key_func_target;
-#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self->priv->source_key_func = _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self->priv->source_key_func_target = _tmp1__target;
+	self->priv->source_key_func_target = source_key_func_target;
 #line 20 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return self;
-#line 373 "DatabaseSourceCollection.c"
+#line 429 "DatabaseSourceCollection.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 380 "DatabaseSourceCollection.c"
+#line 438 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) {
+static void
+database_source_collection_real_notify_items_added (DataCollection* base,
+                                                    GeeIterable* added)
+{
 	DatabaseSourceCollection * self;
-	GeeIterable* _tmp17_;
 #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
 #line 26 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 391 "DatabaseSourceCollection.c"
+#line 451 "DatabaseSourceCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_;
-		GeeIterator* _tmp1_;
-#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_tmp0_ = added;
+		GeeIterator* _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_tmp1_ = gee_iterable_iterator (_tmp0_);
+		_tmp0_ = gee_iterable_iterator (added);
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_object_it = _tmp1_;
+		_object_it = _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		while (TRUE) {
-#line 404 "DatabaseSourceCollection.c"
-			GeeIterator* _tmp2_;
-			gboolean _tmp3_;
+#line 461 "DatabaseSourceCollection.c"
+			GeeIterator* _tmp1_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_;
-			gpointer _tmp5_;
+			GeeIterator* _tmp2_;
+			gpointer _tmp3_;
 			DataSource* source = NULL;
-			DataObject* _tmp6_;
-			DataSource* _tmp7_;
+			DataObject* _tmp4_;
+			DataSource* _tmp5_;
 			gint64 key = 0LL;
-			GetSourceDatabaseKey _tmp8_;
-			void* _tmp8__target;
-			DataSource* _tmp9_;
-			gint64 _tmp10_;
-			GeeHashMap* _tmp11_;
-			gint64 _tmp12_;
-			gboolean _tmp13_;
-			GeeHashMap* _tmp14_;
-			gint64 _tmp15_;
-			DataSource* _tmp16_;
-#line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp2_ = _object_it;
+			GetSourceDatabaseKey _tmp6_;
+			void* _tmp6__target;
+			DataSource* _tmp7_;
+			GeeHashMap* _tmp8_;
+			gint64 _tmp9_;
+			GeeHashMap* _tmp10_;
+			gint64 _tmp11_;
+			DataSource* _tmp12_;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp3_ = gee_iterator_next (_tmp2_);
+			_tmp1_ = _object_it;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			if (!_tmp3_) {
+			if (!gee_iterator_next (_tmp1_)) {
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				break;
-#line 432 "DatabaseSourceCollection.c"
+#line 484 "DatabaseSourceCollection.c"
 			}
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp4_ = _object_it;
+			_tmp2_ = _object_it;
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp5_ = gee_iterator_get (_tmp4_);
+			_tmp3_ = gee_iterator_get (_tmp2_);
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			object = (DataObject*) _tmp5_;
+			object = (DataObject*) _tmp3_;
 #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp6_ = object;
+			_tmp4_ = object;
 #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource));
+			_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
 #line 28 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			source = _tmp7_;
+			source = _tmp5_;
 #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp8_ = self->priv->source_key_func;
-#line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp8__target = self->priv->source_key_func_target;
+			_tmp6_ = self->priv->source_key_func;
 #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp9_ = source;
+			_tmp6__target = self->priv->source_key_func_target;
 #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp10_ = _tmp8_ (_tmp9_, _tmp8__target);
+			_tmp7_ = source;
 #line 29 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			key = _tmp10_;
-#line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp11_ = self->priv->map;
+			key = _tmp6_ (_tmp7_, _tmp6__target);
 #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp12_ = key;
+			_tmp8_ = self->priv->map;
 #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp12_);
+			_tmp9_ = key;
 #line 31 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_vala_assert (!_tmp13_, "!map.has_key(key)");
+			_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp9_), "!map.has_key(key)");
 #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp14_ = self->priv->map;
+			_tmp10_ = self->priv->map;
 #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp15_ = key;
+			_tmp11_ = key;
 #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp16_ = source;
+			_tmp12_ = source;
 #line 33 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp15_, _tmp16_);
+			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp11_, _tmp12_);
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_g_object_unref0 (source);
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_g_object_unref0 (object);
-#line 476 "DatabaseSourceCollection.c"
+#line 524 "DatabaseSourceCollection.c"
 		}
 #line 27 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 480 "DatabaseSourceCollection.c"
+#line 528 "DatabaseSourceCollection.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp17_ = added;
-#line 36 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp17_);
-#line 486 "DatabaseSourceCollection.c"
+	DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), added);
+#line 532 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) {
+static void
+database_source_collection_real_notify_items_removed (DataCollection* base,
+                                                      GeeIterable* removed)
+{
 	DatabaseSourceCollection * self;
-	GeeIterable* _tmp13_;
 #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
 #line 39 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 497 "DatabaseSourceCollection.c"
+#line 545 "DatabaseSourceCollection.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_;
-		GeeIterator* _tmp1_;
+		GeeIterator* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_tmp0_ = removed;
+		_tmp0_ = gee_iterable_iterator (removed);
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-		_object_it = _tmp1_;
+		_object_it = _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		while (TRUE) {
-#line 510 "DatabaseSourceCollection.c"
-			GeeIterator* _tmp2_;
-			gboolean _tmp3_;
+#line 555 "DatabaseSourceCollection.c"
+			GeeIterator* _tmp1_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_;
-			gpointer _tmp5_;
+			GeeIterator* _tmp2_;
+			gpointer _tmp3_;
 			gint64 key = 0LL;
-			GetSourceDatabaseKey _tmp6_;
-			void* _tmp6__target;
-			DataObject* _tmp7_;
-			gint64 _tmp8_;
+			GetSourceDatabaseKey _tmp4_;
+			void* _tmp4__target;
+			DataObject* _tmp5_;
 			gboolean is_removed = FALSE;
-			GeeHashMap* _tmp9_;
-			gint64 _tmp10_;
-			gboolean _tmp11_;
-			gboolean _tmp12_;
+			GeeHashMap* _tmp6_;
+			gint64 _tmp7_;
+			gboolean _tmp8_;
+			gboolean _tmp9_;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp2_ = _object_it;
+			_tmp1_ = _object_it;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			if (!_tmp3_) {
+			if (!gee_iterator_next (_tmp1_)) {
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				break;
-#line 534 "DatabaseSourceCollection.c"
+#line 575 "DatabaseSourceCollection.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp4_ = _object_it;
+			_tmp2_ = _object_it;
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp5_ = gee_iterator_get (_tmp4_);
+			_tmp3_ = gee_iterator_get (_tmp2_);
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			object = (DataObject*) _tmp5_;
+			object = (DataObject*) _tmp3_;
 #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp6_ = self->priv->source_key_func;
+			_tmp4_ = self->priv->source_key_func;
 #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp6__target = self->priv->source_key_func_target;
+			_tmp4__target = self->priv->source_key_func_target;
 #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp7_ = object;
+			_tmp5_ = object;
 #line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp8_ = _tmp6_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), _tmp6__target);
-#line 41 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			key = _tmp8_;
+			key = _tmp4_ (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), _tmp4__target);
 #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp9_ = self->priv->map;
+			_tmp6_ = self->priv->map;
 #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp10_ = key;
+			_tmp7_ = key;
 #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp11_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, NULL);
+			_tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, NULL);
 #line 43 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			is_removed = _tmp11_;
+			is_removed = _tmp8_;
 #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp12_ = is_removed;
+			_tmp9_ = is_removed;
 #line 44 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_vala_assert (_tmp12_, "is_removed");
+			_vala_assert (_tmp9_, "is_removed");
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_g_object_unref0 (object);
-#line 566 "DatabaseSourceCollection.c"
+#line 605 "DatabaseSourceCollection.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 		_g_object_unref0 (_object_it);
-#line 570 "DatabaseSourceCollection.c"
+#line 609 "DatabaseSourceCollection.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp13_ = removed;
-#line 47 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp13_);
-#line 576 "DatabaseSourceCollection.c"
+	DATA_COLLECTION_CLASS (database_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed);
+#line 613 "DatabaseSourceCollection.c"
 }
 
 
-DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key) {
+DataSource*
+database_source_collection_fetch_by_key (DatabaseSourceCollection* self,
+                                         gint64 key)
+{
 	DataSource* result = NULL;
 	GeeHashMap* _tmp0_;
-	gint64 _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
 #line 50 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_DATABASE_SOURCE_COLLECTION (self), NULL);
 #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	_tmp0_ = self->priv->map;
 #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1_ = key;
-#line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &key);
 #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	result = (DataSource*) _tmp2_;
+	result = (DataSource*) _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return result;
-#line 597 "DatabaseSourceCollection.c"
+#line 634 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_collection_class_init (DatabaseSourceCollectionClass * klass) {
+static void
+database_source_collection_class_init (DatabaseSourceCollectionClass * klass)
+{
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	database_source_collection_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -608,11 +647,13 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass
 	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_added;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) database_source_collection_real_notify_items_removed;
-#line 612 "DatabaseSourceCollection.c"
+#line 651 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_collection_instance_init (DatabaseSourceCollection * self) {
+static void
+database_source_collection_instance_init (DatabaseSourceCollection * self)
+{
 	GeeHashMap* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self);
@@ -620,11 +661,13 @@ static void database_source_collection_instance_init (DatabaseSourceCollection *
 	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv->map = _tmp0_;
-#line 624 "DatabaseSourceCollection.c"
+#line 665 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_collection_finalize (DataCollection * obj) {
+static void
+database_source_collection_finalize (DataCollection * obj)
+{
 	DatabaseSourceCollection * self;
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection);
@@ -632,11 +675,13 @@ static void database_source_collection_finalize (DataCollection * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	DATA_COLLECTION_CLASS (database_source_collection_parent_class)->finalize (obj);
-#line 636 "DatabaseSourceCollection.c"
+#line 679 "DatabaseSourceCollection.c"
 }
 
 
-GType database_source_collection_get_type (void) {
+GType
+database_source_collection_get_type (void)
+{
 	static volatile gsize database_source_collection_type_id__volatile = 0;
 	if (g_once_init_enter (&database_source_collection_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceCollection), 0, (GInstanceInitFunc) database_source_collection_instance_init, NULL };
@@ -648,71 +693,69 @@ GType database_source_collection_get_type (void) {
 }
 
 
-DatabaseSourceHoldingTank* database_source_holding_tank_construct (GType object_type, SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
+DatabaseSourceHoldingTank*
+database_source_holding_tank_construct (GType object_type,
+                                        SourceCollection* sources,
+                                        SourceHoldingTankCheckToKeep check_to_keep,
+                                        void* check_to_keep_target,
+                                        GetSourceDatabaseKey get_key,
+                                        void* get_key_target)
+{
 	DatabaseSourceHoldingTank* self = NULL;
-	SourceCollection* _tmp0_;
-	SourceHoldingTankCheckToKeep _tmp1_;
-	void* _tmp1__target;
-	GetSourceDatabaseKey _tmp2_;
-	void* _tmp2__target;
 #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp0_ = sources;
-#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1_ = check_to_keep;
-#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1__target = check_to_keep_target;
-#line 62 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, _tmp0_, _tmp1_, _tmp1__target);
-#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp2_ = get_key;
-#line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp2__target = get_key_target;
+	self = (DatabaseSourceHoldingTank*) source_holding_tank_construct (object_type, sources, check_to_keep, check_to_keep_target);
 #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self->priv->get_key = _tmp2_;
+	self->priv->get_key = get_key;
 #line 64 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	self->priv->get_key_target = _tmp2__target;
+	self->priv->get_key_target = get_key_target;
 #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return self;
-#line 679 "DatabaseSourceCollection.c"
+#line 716 "DatabaseSourceCollection.c"
 }
 
 
-DatabaseSourceHoldingTank* database_source_holding_tank_new (SourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
+DatabaseSourceHoldingTank*
+database_source_holding_tank_new (SourceCollection* sources,
+                                  SourceHoldingTankCheckToKeep check_to_keep,
+                                  void* check_to_keep_target,
+                                  GetSourceDatabaseKey get_key,
+                                  void* get_key_target)
+{
 #line 60 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return database_source_holding_tank_construct (TYPE_DATABASE_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 686 "DatabaseSourceCollection.c"
+#line 729 "DatabaseSourceCollection.c"
 }
 
 
-DataSource* database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self, gint64 id) {
+DataSource*
+database_source_holding_tank_get_by_id (DatabaseSourceHoldingTank* self,
+                                        gint64 id)
+{
 	DataSource* result = NULL;
 	GeeHashMap* _tmp0_;
-	gint64 _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_val_if_fail (IS_DATABASE_SOURCE_HOLDING_TANK (self), NULL);
 #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	_tmp0_ = self->priv->map;
 #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp1_ = id;
-#line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &id);
 #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	result = (DataSource*) _tmp2_;
+	result = (DataSource*) _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	return result;
-#line 707 "DatabaseSourceCollection.c"
+#line 750 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
+static void
+database_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base,
+                                                           GeeCollection* added,
+                                                           GeeCollection* removed)
+{
 	DatabaseSourceHoldingTank * self;
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp12_;
-	GeeCollection* _tmp23_;
-	GeeCollection* _tmp24_;
 #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);
 #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -720,149 +763,131 @@ static void database_source_holding_tank_real_notify_contents_altered (SourceHol
 #line 71 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp0_ = added;
-#line 73 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	if (_tmp0_ != NULL) {
-#line 727 "DatabaseSourceCollection.c"
+	if (added != NULL) {
+#line 768 "DatabaseSourceCollection.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_;
-			GeeIterator* _tmp2_;
+			GeeIterator* _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp1_ = added;
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_source_it = _tmp2_;
+			_source_it = _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			while (TRUE) {
-#line 740 "DatabaseSourceCollection.c"
-				GeeIterator* _tmp3_;
-				gboolean _tmp4_;
+#line 778 "DatabaseSourceCollection.c"
+				GeeIterator* _tmp1_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp5_;
-				gpointer _tmp6_;
-				GeeHashMap* _tmp7_;
-				GetSourceDatabaseKey _tmp8_;
-				void* _tmp8__target;
-				DataSource* _tmp9_;
-				gint64 _tmp10_;
-				DataSource* _tmp11_;
-#line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp3_ = _source_it;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				GeeHashMap* _tmp4_;
+				GetSourceDatabaseKey _tmp5_;
+				void* _tmp5__target;
+				DataSource* _tmp6_;
+				gint64 _tmp7_;
+				DataSource* _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp4_ = gee_iterator_next (_tmp3_);
+				_tmp1_ = _source_it;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				if (!_tmp4_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 					break;
-#line 760 "DatabaseSourceCollection.c"
+#line 795 "DatabaseSourceCollection.c"
 				}
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp5_ = _source_it;
+				_tmp2_ = _source_it;
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp6_ = gee_iterator_get (_tmp5_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				source = (DataSource*) _tmp6_;
+				source = (DataSource*) _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp7_ = self->priv->map;
+				_tmp4_ = self->priv->map;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp8_ = self->priv->get_key;
+				_tmp5_ = self->priv->get_key;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp8__target = self->priv->get_key_target;
+				_tmp5__target = self->priv->get_key_target;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp9_ = source;
+				_tmp6_ = source;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp10_ = _tmp8_ (_tmp9_, _tmp8__target);
+				_tmp7_ = _tmp5_ (_tmp6_, _tmp5__target);
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp11_ = source;
+				_tmp8_ = source;
 #line 75 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp10_, _tmp11_);
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp7_, _tmp8_);
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				_g_object_unref0 (source);
-#line 784 "DatabaseSourceCollection.c"
+#line 819 "DatabaseSourceCollection.c"
 			}
 #line 74 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_g_object_unref0 (_source_it);
-#line 788 "DatabaseSourceCollection.c"
+#line 823 "DatabaseSourceCollection.c"
 		}
 	}
 #line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp12_ = removed;
-#line 78 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	if (_tmp12_ != NULL) {
-#line 795 "DatabaseSourceCollection.c"
+	if (removed != NULL) {
+#line 828 "DatabaseSourceCollection.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp13_;
-			GeeIterator* _tmp14_;
-#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp13_ = removed;
+			GeeIterator* _tmp9_;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-			_source_it = _tmp14_;
+			_source_it = _tmp9_;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			while (TRUE) {
-#line 808 "DatabaseSourceCollection.c"
-				GeeIterator* _tmp15_;
-				gboolean _tmp16_;
+#line 838 "DatabaseSourceCollection.c"
+				GeeIterator* _tmp10_;
 				DataSource* source = NULL;
-				GeeIterator* _tmp17_;
-				gpointer _tmp18_;
-				GeeHashMap* _tmp19_;
-				GetSourceDatabaseKey _tmp20_;
-				void* _tmp20__target;
-				DataSource* _tmp21_;
-				gint64 _tmp22_;
+				GeeIterator* _tmp11_;
+				gpointer _tmp12_;
+				GeeHashMap* _tmp13_;
+				GetSourceDatabaseKey _tmp14_;
+				void* _tmp14__target;
+				DataSource* _tmp15_;
+				gint64 _tmp16_;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp15_ = _source_it;
+				_tmp10_ = _source_it;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp16_ = gee_iterator_next (_tmp15_);
-#line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				if (!_tmp16_) {
+				if (!gee_iterator_next (_tmp10_)) {
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 					break;
-#line 827 "DatabaseSourceCollection.c"
+#line 854 "DatabaseSourceCollection.c"
 				}
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp17_ = _source_it;
+				_tmp11_ = _source_it;
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp18_ = gee_iterator_get (_tmp17_);
+				_tmp12_ = gee_iterator_get (_tmp11_);
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				source = (DataSource*) _tmp18_;
+				source = (DataSource*) _tmp12_;
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp19_ = self->priv->map;
+				_tmp13_ = self->priv->map;
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp20_ = self->priv->get_key;
+				_tmp14_ = self->priv->get_key;
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp20__target = self->priv->get_key_target;
+				_tmp14__target = self->priv->get_key_target;
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp21_ = source;
+				_tmp15_ = source;
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				_tmp22_ = _tmp20_ (_tmp21_, _tmp20__target);
+				_tmp16_ = _tmp14_ (_tmp15_, _tmp14__target);
 #line 80 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp22_, NULL);
+				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp16_, NULL);
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 				_g_object_unref0 (source);
-#line 849 "DatabaseSourceCollection.c"
+#line 876 "DatabaseSourceCollection.c"
 			}
 #line 79 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 			_g_object_unref0 (_source_it);
-#line 853 "DatabaseSourceCollection.c"
+#line 880 "DatabaseSourceCollection.c"
 		}
 	}
 #line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp23_ = added;
-#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	_tmp24_ = removed;
-#line 83 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
-	SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp23_, _tmp24_);
-#line 862 "DatabaseSourceCollection.c"
+	SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), added, removed);
+#line 885 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass) {
+static void
+database_source_holding_tank_class_init (DatabaseSourceHoldingTankClass * klass)
+{
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	database_source_holding_tank_parent_class = g_type_class_peek_parent (klass);
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
@@ -871,11 +896,13 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl
 	g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate));
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
-#line 875 "DatabaseSourceCollection.c"
+#line 900 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self) {
+static void
+database_source_holding_tank_instance_init (DatabaseSourceHoldingTank * self)
+{
 	GeeHashMap* _tmp0_;
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
@@ -883,11 +910,13 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan
 	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv->map = _tmp0_;
-#line 887 "DatabaseSourceCollection.c"
+#line 914 "DatabaseSourceCollection.c"
 }
 
 
-static void database_source_holding_tank_finalize (SourceHoldingTank * obj) {
+static void
+database_source_holding_tank_finalize (SourceHoldingTank * obj)
+{
 	DatabaseSourceHoldingTank * self;
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank);
@@ -895,11 +924,13 @@ static void database_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	SOURCE_HOLDING_TANK_CLASS (database_source_holding_tank_parent_class)->finalize (obj);
-#line 899 "DatabaseSourceCollection.c"
+#line 928 "DatabaseSourceCollection.c"
 }
 
 
-GType database_source_holding_tank_get_type (void) {
+GType
+database_source_holding_tank_get_type (void)
+{
 	static volatile gsize database_source_holding_tank_type_id__volatile = 0;
 	if (g_once_init_enter (&database_source_holding_tank_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DatabaseSourceHoldingTankClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) database_source_holding_tank_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DatabaseSourceHoldingTank), 0, (GInstanceInitFunc) database_source_holding_tank_instance_init, NULL };