Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 41 insertions, 41 deletions

diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 6f03093..21c509f 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.4, the Vala compiler
+/* DataCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -589,7 +589,7 @@ GeeCollection* data_collection_get_singleton (DataObject* object) {
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = object;
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_);
+	_tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -609,7 +609,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration
 #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), NULL);
 #line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1259,7 +1259,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 #line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
 #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	added = _tmp0_;
 #line 1266 "DataCollection.c"
@@ -1352,7 +1352,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp16_ = added;
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp18_ = _tmp17_;
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1572,7 +1572,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp6_ = _tmp5_->marked;
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp8_ = _tmp7_;
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1829,7 +1829,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 #line 1828 "DataCollection.c"
 					GeeArrayList* _tmp18_ = NULL;
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-					_tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 					_g_object_unref0 (skipped);
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1883,7 +1883,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp27_ = _tmp26_->marked;
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp29_ = _tmp28_;
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1996,7 +1996,7 @@ static void data_collection_real_clear (DataCollection* self) {
 #line 1995 "DataCollection.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	removed = _tmp2_;
 #line 2001 "DataCollection.c"
@@ -2084,7 +2084,7 @@ static void data_collection_real_clear (DataCollection* self) {
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp16_ = _object_list;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp18_ = _tmp17_;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2233,7 +2233,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 #line 2232 "DataCollection.c"
 			GeeHashMap* _tmp8_ = NULL;
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-			_tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+			_tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 			_g_object_unref0 (self->priv->frozen_items_altered);
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2897,7 +2897,7 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	callback (data1, g_value_get_string (param_values + 1), g_value_get_boxed (param_values + 2), g_value_get_boxed (param_values + 3), data2);
+	callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2);
 #line 2900 "DataCollection.c"
 }
 
@@ -3319,7 +3319,7 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp2_ = self->marked;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp4_ = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3350,7 +3350,7 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
 #line 76 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
 #line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	copy = _tmp0_;
 #line 78 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3454,7 +3454,7 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = self->marked;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp3_ = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3539,7 +3539,7 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa
 static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) {
 	GeeHashSet* _tmp0_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->marked = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3772,51 +3772,51 @@ static void data_collection_class_init (DataCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_type_class_add_private (klass, sizeof (DataCollectionPrivate));
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->to_string = data_collection_real_to_string;
+	((DataCollectionClass *) klass)->to_string = (gchar* (*)(DataCollection*)) data_collection_real_to_string;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_added = data_collection_real_notify_items_added;
+	((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_added;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_removed = data_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_removed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_contents_altered = data_collection_real_notify_contents_altered;
+	((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_items_altered = data_collection_real_notify_items_altered;
+	((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) data_collection_real_notify_items_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_ordering_changed = data_collection_real_notify_ordering_changed;
+	((DataCollectionClass *) klass)->notify_ordering_changed = (void (*)(DataCollection*)) data_collection_real_notify_ordering_changed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_property_set = data_collection_real_notify_property_set;
+	((DataCollectionClass *) klass)->notify_property_set = (void (*)(DataCollection*, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_property_cleared = data_collection_real_notify_property_cleared;
+	((DataCollectionClass *) klass)->notify_property_cleared = (void (*)(DataCollection*, const gchar*)) data_collection_real_notify_property_cleared;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->valid_type = data_collection_real_valid_type;
+	((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_valid_type;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->set_comparator = data_collection_real_set_comparator;
+	((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->reset_comparator = data_collection_real_reset_comparator;
+	((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) data_collection_real_reset_comparator;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_all = data_collection_real_get_all;
+	((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) data_collection_real_get_all;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_count = data_collection_real_get_count;
+	((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) data_collection_real_get_count;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->get_at = data_collection_real_get_at;
+	((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) data_collection_real_get_at;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->index_of = data_collection_real_index_of;
+	((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) data_collection_real_index_of;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->contains = data_collection_real_contains;
+	((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_contains;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->add = data_collection_real_add;
+	((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_add;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->add_many = data_collection_real_add_many;
+	((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->remove_marked = data_collection_real_remove_marked;
+	((DataCollectionClass *) klass)->remove_marked = (void (*)(DataCollection*, Marker*)) data_collection_real_remove_marked;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->clear = data_collection_real_clear;
+	((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) data_collection_real_clear;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->close = data_collection_real_close;
+	((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) data_collection_real_close;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_frozen = data_collection_real_notify_frozen;
+	((DataCollectionClass *) klass)->notify_frozen = (void (*)(DataCollection*)) data_collection_real_notify_frozen;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	((DataCollectionClass *) klass)->notify_thawed = data_collection_real_notify_thawed;
+	((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) data_collection_real_notify_thawed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	((DataCollectionClass *) klass)->items_added = data_collection_real_items_added;
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3846,7 +3846,7 @@ static void data_collection_class_init (DataCollectionClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_signal_new ("ordering_changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_VALUE);
+	g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_signal_new ("property_cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3867,7 +3867,7 @@ static void data_collection_instance_init (DataCollection * self) {
 #line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->priv->dataset = _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, (GDestroyNotify) _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->priv->properties = _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/core/DataCollection.vala"