New upstream version 0.26.1upstream/0.26.1

1 files changed, 14 insertions, 14 deletions

diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 229c57a..56575f3 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.34.4, the Vala compiler
+/* PixbufCache.c generated by valac 0.34.7, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1331,7 +1331,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = self->priv->in_progress;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp2_ = _tmp1_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1914,7 +1914,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = self->priv->lru;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.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 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp8_ = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1930,7 +1930,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = self->priv->lru;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp13_ = _tmp12_;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1960,13 +1960,13 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = self->priv->lru;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp22_ = _tmp21_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp23_ = self->priv->cache;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_MAP, GeeMap));
+	_tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp25_ = _tmp24_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2062,7 +2062,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) {
 	PixbufCachePixbufCacheBatch * self = NULL;
 #line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL);
+	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL);
 #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
 #line 2069 "PixbufCache.c"
@@ -2182,7 +2182,7 @@ static void pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass)
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	((BackgroundJobClass *) klass)->finalize = pixbuf_cache_fetch_job_finalize;
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->get_priority = pixbuf_cache_fetch_job_real_get_priority;
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) pixbuf_cache_fetch_job_real_get_priority;
 #line 2187 "PixbufCache.c"
 }
 
@@ -2342,7 +2342,7 @@ static void pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetch
 #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_baseline_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->execute = pixbuf_cache_baseline_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_baseline_fetch_job_real_execute;
 #line 2347 "PixbufCache.c"
 }
 
@@ -2481,7 +2481,7 @@ static void pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobC
 #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_master_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	((BackgroundJobClass *) klass)->execute = pixbuf_cache_master_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_master_fetch_job_real_execute;
 #line 2486 "PixbufCache.c"
 }
 
@@ -2522,15 +2522,15 @@ static void pixbuf_cache_instance_init (PixbufCache * self) {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv = PIXBUF_CACHE_GET_PRIVATE (self);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->cache = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->lru = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->in_progress = _tmp2_;
 #line 2537 "PixbufCache.c"
@@ -2577,7 +2577,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = self->priv->in_progress;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap));
+		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp7_ = _tmp6_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"