Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 17 insertions, 17 deletions

diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index a19ad01..1a9aeea 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.34.4, the Vala compiler
+/* MetadataWriter.c generated by valac 0.34.7, the Vala compiler
  * generated from MetadataWriter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -956,7 +956,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self = (MetadataWriter*) g_object_new (object_type, NULL);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp0_ = hash_timed_queue_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, METADATA_WRITER_COMMIT_DELAY_MSEC, _metadata_writer_on_photo_dequeued_dequeued_callback, self, NULL, NULL, NULL, NULL, NULL, NULL, G_PRIORITY_DEFAULT);
+	_tmp0_ = hash_timed_queue_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, METADATA_WRITER_COMMIT_DELAY_MSEC, _metadata_writer_on_photo_dequeued_dequeued_callback, self, NULL, NULL, NULL, NULL, NULL, NULL, G_PRIORITY_DEFAULT);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_timed_queue_unref0 (self->priv->dirty);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1677,7 +1677,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 #line 1678 "MetadataWriter.c"
 					GeeHashSet* _tmp20_ = NULL;
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-					_tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photos);
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1778,7 +1778,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 #line 1779 "MetadataWriter.c"
 							GeeHashSet* _tmp36_ = NULL;
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-							_tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+							_tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 							_g_object_unref0 (photos);
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2006,7 +2006,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 #line 2007 "MetadataWriter.c"
 				GeeHashSet* _tmp17_ = NULL;
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-				_tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+				_tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 				_g_object_unref0 (photos);
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -2169,7 +2169,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
 #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		added_photos = _tmp5_;
 #line 2176 "MetadataWriter.c"
@@ -2313,7 +2313,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		gchar* _tmp46_ = NULL;
 		gchar* _tmp47_ = NULL;
 #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		removed_photos = _tmp30_;
 #line 2320 "MetadataWriter.c"
@@ -2430,7 +2430,7 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	photos = _tmp0_;
 #line 2437 "MetadataWriter.c"
@@ -2769,7 +2769,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 #line 2770 "MetadataWriter.c"
 					GeeArrayList* _tmp15_ = NULL;
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-					_tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photos);
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3138,7 +3138,7 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp1_ = self->priv->pending;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap));
+		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = _tmp2_;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3371,7 +3371,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 #line 3372 "MetadataWriter.c"
 		GeeHashSet* _tmp5_ = NULL;
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_g_object_unref0 (keywords);
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4690,7 +4690,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 #line 4691 "MetadataWriter.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	safe_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_SET, GeeSet);
 #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4870,7 +4870,7 @@ static void metadata_writer_commit_job_class_init (MetadataWriterCommitJobClass
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	((BackgroundJobClass *) klass)->finalize = metadata_writer_commit_job_finalize;
 #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	((BackgroundJobClass *) klass)->execute = metadata_writer_commit_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) metadata_writer_commit_job_real_execute;
 #line 4875 "MetadataWriter.c"
 }
 
@@ -4950,15 +4950,15 @@ static void metadata_writer_instance_init (MetadataWriter * self) {
 #line 165 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->enabled = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp1_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 167 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pending = _tmp1_;
 #line 168 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp2_ = gee_hash_set_new (METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_set_new (METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 168 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pending_cancel = _tmp2_;
 #line 169 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp3_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp3_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 169 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->interested_photo_details = _tmp3_;
 #line 170 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4972,7 +4972,7 @@ static void metadata_writer_instance_init (MetadataWriter * self) {
 #line 174 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pause_count = 0;
 #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->importing_photos = _tmp4_;
 #line 4979 "MetadataWriter.c"