diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/ThumbnailCache.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/ThumbnailCache.c')
| -rw-r--r-- | src/ThumbnailCache.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c index c65d22e..0dac00c 100644 --- a/src/ThumbnailCache.c +++ b/src/ThumbnailCache.c @@ -1,4 +1,4 @@ -/* ThumbnailCache.c generated by valac 0.34.4, the Vala compiler +/* ThumbnailCache.c generated by valac 0.34.7, the Vala compiler * generated from ThumbnailCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -912,7 +912,7 @@ static void thumbnails_instance_init (Thumbnails * self) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv = THUMBNAILS_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, 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 (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->map = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3338,7 +3338,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp17_ = self->priv->cache_lru; #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp19_ = _tmp18_; #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3346,7 +3346,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp20_ = self->priv->cache_lru; #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.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 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp22_ = _tmp21_; #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4396,9 +4396,9 @@ static void thumbnail_cache_async_fetch_job_class_init (ThumbnailCacheAsyncFetch #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" ((BackgroundJobClass *) klass)->finalize = thumbnail_cache_async_fetch_job_finalize; #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - ((BackgroundJobClass *) klass)->get_priority = thumbnail_cache_async_fetch_job_real_get_priority; + ((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_get_priority; #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - ((BackgroundJobClass *) klass)->execute = thumbnail_cache_async_fetch_job_real_execute; + ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_execute; #line 4402 "ThumbnailCache.c" } @@ -4478,11 +4478,11 @@ static void thumbnail_cache_instance_init (ThumbnailCache * self) { #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv = THUMBNAIL_CACHE_GET_PRIVATE (self); #line 186 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, (GBoxedCopyFunc) thumbnail_cache_image_data_ref, thumbnail_cache_image_data_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, (GBoxedCopyFunc) thumbnail_cache_image_data_ref, (GDestroyNotify) thumbnail_cache_image_data_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 186 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->cache_map = _tmp0_; #line 187 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 187 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->cache_lru = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" |