Merge branch 'feature/upstream' into develop

1 files changed, 114 insertions, 110 deletions

diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index a6ea6b0..cc12b64 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.34.7, the Vala compiler
+/* DataSet.c generated by valac 0.36.6, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -162,7 +162,7 @@ gboolean data_set_remove (DataSet* self, DataObject* object);
 gboolean data_set_remove_many (DataSet* self, GeeCollection* objects);
 gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration* alteration);
 gboolean sorted_list_resort_item (SortedList* self, gconstpointer item);
-static void data_set_finalize (DataSet* obj);
+static void data_set_finalize (DataSet * obj);
 
 
 DataSet* data_set_construct (GType object_type) {
@@ -186,10 +186,10 @@ DataSet* data_set_new (void) {
 
 static gint64 data_set_order_added_comparator (DataSet* self, void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-	void* _tmp2_ = NULL;
-	gint64 _tmp3_ = 0LL;
+	void* _tmp0_;
+	gint64 _tmp1_;
+	void* _tmp2_;
+	gint64 _tmp3_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0LL);
 #line 40 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -226,13 +226,13 @@ static gboolean data_set_order_added_predicate (DataSet* self, DataObject* objec
 
 static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
+	void* _tmp0_;
+	void* _tmp1_;
 	gint64 _result_ = 0LL;
-	Comparator _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint64 _tmp7_ = 0LL;
-	gint64 _tmp11_ = 0LL;
+	Comparator _tmp2_;
+	void* _tmp2__target;
+	gint64 _tmp7_;
+	gint64 _tmp11_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0LL);
 #line 49 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -256,11 +256,11 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 #line 56 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp2_ != NULL) {
 #line 259 "DataSet.c"
-		Comparator _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
-		void* _tmp4_ = NULL;
-		void* _tmp5_ = NULL;
-		gint64 _tmp6_ = 0LL;
+		Comparator _tmp3_;
+		void* _tmp3__target;
+		void* _tmp4_;
+		void* _tmp5_;
+		gint64 _tmp6_;
 #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp3_ = self->priv->user_comparator;
 #line 57 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -280,9 +280,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 #line 59 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp7_ == ((gint64) 0)) {
 #line 283 "DataSet.c"
-		void* _tmp8_ = NULL;
-		void* _tmp9_ = NULL;
-		gint64 _tmp10_ = 0LL;
+		void* _tmp8_;
+		void* _tmp9_;
+		gint64 _tmp10_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp8_ = a;
 #line 60 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -307,9 +307,9 @@ static gint64 data_set_comparator_wrapper (DataSet* self, void* a, void* b) {
 
 gboolean data_set_contains (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
-	GeeHashSet* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashSet* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
 #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -330,8 +330,8 @@ gboolean data_set_contains (DataSet* self, DataObject* object) {
 
 inline gint data_set_get_count (DataSet* self) {
 	gint result = 0;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SortedList* _tmp0_;
+	gint _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0);
 #line 72 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -365,7 +365,7 @@ static gint64 _data_set_order_added_comparator_comparator (void* a, void* b, gpo
 
 
 void data_set_reset_comparator (DataSet* self) {
-	SortedList* _tmp0_ = NULL;
+	SortedList* _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (IS_DATA_SET (self));
 #line 76 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -386,10 +386,10 @@ void data_set_reset_comparator (DataSet* self) {
 
 Comparator data_set_get_comparator (DataSet* self, void** result_target) {
 	Comparator result = NULL;
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	Comparator _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
+	Comparator _tmp1_;
+	void* _tmp1__target;
 #line 81 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 82 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -412,10 +412,10 @@ Comparator data_set_get_comparator (DataSet* self, void** result_target) {
 
 ComparatorPredicate data_set_get_comparator_predicate (DataSet* self, void** result_target) {
 	ComparatorPredicate result = NULL;
-	ComparatorPredicate _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	ComparatorPredicate _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	ComparatorPredicate _tmp0_;
+	void* _tmp0__target;
+	ComparatorPredicate _tmp1_;
+	void* _tmp1__target;
 #line 85 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 86 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -446,11 +446,11 @@ static gint64 _data_set_comparator_wrapper_comparator (void* a, void* b, gpointe
 
 
 void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* user_comparator_target, ComparatorPredicate comparator_predicate, void* comparator_predicate_target) {
-	Comparator _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	ComparatorPredicate _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	SortedList* _tmp2_ = NULL;
+	Comparator _tmp0_;
+	void* _tmp0__target;
+	ComparatorPredicate _tmp1_;
+	void* _tmp1__target;
+	SortedList* _tmp2_;
 #line 89 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (IS_DATA_SET (self));
 #line 90 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -479,9 +479,9 @@ void data_set_set_comparator (DataSet* self, Comparator user_comparator, void* u
 
 GeeList* data_set_get_all (DataSet* self) {
 	GeeList* result = NULL;
-	SortedList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
+	SortedList* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp2_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 96 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -501,11 +501,11 @@ GeeList* data_set_get_all (DataSet* self) {
 DataSet* data_set_copy (DataSet* self) {
 	DataSet* result = NULL;
 	DataSet* clone = NULL;
-	DataSet* _tmp0_ = NULL;
-	SortedList* _tmp1_ = NULL;
-	SortedList* _tmp2_ = NULL;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeHashSet* _tmp4_ = NULL;
+	DataSet* _tmp0_;
+	SortedList* _tmp1_;
+	SortedList* _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeHashSet* _tmp4_;
 #line 99 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 100 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -536,9 +536,9 @@ DataSet* data_set_copy (DataSet* self) {
 
 DataObject* data_set_get_at (DataSet* self, gint index) {
 	DataObject* result = NULL;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gpointer _tmp2_ = NULL;
+	SortedList* _tmp0_;
+	gint _tmp1_;
+	gpointer _tmp2_;
 #line 107 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), NULL);
 #line 108 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -557,10 +557,10 @@ DataObject* data_set_get_at (DataSet* self, gint index) {
 
 gint data_set_index_of (DataSet* self, DataObject* object) {
 	gint result = 0;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	GEqualFunc _tmp2_ = NULL;
-	gint _tmp3_ = 0;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	GEqualFunc _tmp2_;
+	gint _tmp3_;
 #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), 0);
 #line 111 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -583,12 +583,12 @@ gint data_set_index_of (DataSet* self, DataObject* object) {
 
 gboolean data_set_add (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
+	gboolean _tmp5_;
 #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 116 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -616,8 +616,8 @@ gboolean data_set_add (DataSet* self, DataObject* object) {
 #line 120 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!_tmp5_) {
 #line 619 "DataSet.c"
-		SortedList* _tmp6_ = NULL;
-		DataObject* _tmp7_ = NULL;
+		SortedList* _tmp6_;
+		DataObject* _tmp7_;
 #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp6_ = self->priv->list;
 #line 122 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -641,16 +641,16 @@ gboolean data_set_add (DataSet* self, DataObject* object) {
 gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 	gboolean result = FALSE;
 	gint count = 0;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	SortedList* _tmp4_ = NULL;
-	GeeCollection* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	GeeHashSet* _tmp7_ = NULL;
-	GeeCollection* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	SortedList* _tmp4_;
+	GeeCollection* _tmp5_;
+	gboolean _tmp6_;
+	GeeHashSet* _tmp7_;
+	GeeCollection* _tmp8_;
+	gboolean _tmp9_;
 #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 131 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -696,8 +696,8 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 #line 139 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!_tmp9_) {
 #line 699 "DataSet.c"
-		SortedList* _tmp10_ = NULL;
-		GeeCollection* _tmp11_ = NULL;
+		SortedList* _tmp10_;
+		GeeCollection* _tmp11_;
 #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp10_ = self->priv->list;
 #line 141 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -721,12 +721,12 @@ gboolean data_set_add_many (DataSet* self, GeeCollection* objects) {
 gboolean data_set_remove (DataSet* self, DataObject* object) {
 	gboolean result = FALSE;
 	gboolean success = FALSE;
-	SortedList* _tmp0_ = NULL;
-	DataObject* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	DataObject* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	DataObject* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	DataObject* _tmp4_;
+	gboolean _tmp5_;
 #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 149 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -768,12 +768,12 @@ gboolean data_set_remove (DataSet* self, DataObject* object) {
 gboolean data_set_remove_many (DataSet* self, GeeCollection* objects) {
 	gboolean result = FALSE;
 	gboolean success = FALSE;
-	SortedList* _tmp0_ = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GeeHashSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	SortedList* _tmp0_;
+	GeeCollection* _tmp1_;
+	gboolean _tmp2_;
+	GeeHashSet* _tmp3_;
+	GeeCollection* _tmp4_;
+	gboolean _tmp5_;
 #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 161 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -816,11 +816,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	ComparatorPredicate _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SortedList* _tmp8_ = NULL;
-	DataObject* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	ComparatorPredicate _tmp2_;
+	void* _tmp2__target;
+	SortedList* _tmp8_;
+	DataObject* _tmp9_;
+	gboolean _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_val_if_fail (IS_DATA_SET (self), FALSE);
 #line 174 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -834,7 +834,7 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp2_ != NULL) {
 #line 837 "DataSet.c"
-		Alteration* _tmp3_ = NULL;
+		Alteration* _tmp3_;
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp3_ = alteration;
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -848,11 +848,11 @@ gboolean data_set_resort_object (DataSet* self, DataObject* object, Alteration*
 #line 175 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (_tmp1_) {
 #line 851 "DataSet.c"
-		ComparatorPredicate _tmp4_ = NULL;
-		void* _tmp4__target = NULL;
-		DataObject* _tmp5_ = NULL;
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		ComparatorPredicate _tmp4_;
+		void* _tmp4__target;
+		DataObject* _tmp5_;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		_tmp4_ = self->priv->comparator_predicate;
 #line 176 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -935,7 +935,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (collect_values[0].v_pointer) {
 #line 938 "DataSet.c"
-		DataSet* object;
+		DataSet * object;
 		object = collect_values[0].v_pointer;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -962,7 +962,7 @@ static gchar* value_data_set_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_data_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataSet** object_p;
+	DataSet ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (!object_p) {
@@ -1014,7 +1014,7 @@ gpointer value_get_data_set (const GValue* value) {
 
 
 void value_set_data_set (GValue* value, gpointer v_object) {
-	DataSet* old;
+	DataSet * old;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET));
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1045,7 +1045,7 @@ void value_set_data_set (GValue* value, gpointer v_object) {
 
 
 void value_take_data_set (GValue* value, gpointer v_object) {
-	DataSet* old;
+	DataSet * old;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATA_SET));
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1085,8 +1085,8 @@ static void data_set_class_init (DataSetClass * klass) {
 
 
 static void data_set_instance_init (DataSet * self) {
-	SortedList* _tmp0_ = NULL;
-	GeeHashSet* _tmp1_ = NULL;
+	SortedList* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv = DATA_SET_GET_PRIVATE (self);
 #line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala"
@@ -1099,15 +1099,19 @@ static void data_set_instance_init (DataSet * self) {
 	self->priv->hash_set = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->user_comparator = NULL;
+#line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
+	self->priv->user_comparator_target = self;
 #line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->comparator_predicate = NULL;
+#line 33 "/home/jens/Source/shotwell/src/core/DataSet.vala"
+	self->priv->comparator_predicate_target = self;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->ref_count = 1;
-#line 1107 "DataSet.c"
+#line 1111 "DataSet.c"
 }
 
 
-static void data_set_finalize (DataSet* obj) {
+static void data_set_finalize (DataSet * obj) {
 	DataSet * self;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_SET, DataSet);
@@ -1117,7 +1121,7 @@ static void data_set_finalize (DataSet* obj) {
 	_g_object_unref0 (self->priv->list);
 #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	_g_object_unref0 (self->priv->hash_set);
-#line 1121 "DataSet.c"
+#line 1125 "DataSet.c"
 }
 
 
@@ -1136,18 +1140,18 @@ GType data_set_get_type (void) {
 
 
 gpointer data_set_ref (gpointer instance) {
-	DataSet* self;
+	DataSet * self;
 	self = instance;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	return instance;
-#line 1146 "DataSet.c"
+#line 1150 "DataSet.c"
 }
 
 
 void data_set_unref (gpointer instance) {
-	DataSet* self;
+	DataSet * self;
 	self = instance;
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1155,7 +1159,7 @@ void data_set_unref (gpointer instance) {
 		DATA_SET_GET_CLASS (self)->finalize (self);
 #line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1159 "DataSet.c"
+#line 1163 "DataSet.c"
 	}
 }