diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/PixbufCache.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/PixbufCache.c')
| -rw-r--r-- | src/PixbufCache.c | 927 |
1 files changed, 466 insertions, 461 deletions
diff --git a/src/PixbufCache.c b/src/PixbufCache.c index 56575f3..f50ca76 100644 --- a/src/PixbufCache.c +++ b/src/PixbufCache.c @@ -1,4 +1,4 @@ -/* PixbufCache.c generated by valac 0.34.7, the Vala compiler +/* PixbufCache.c generated by valac 0.36.6, the Vala compiler * generated from PixbufCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -221,6 +221,11 @@ typedef struct _SemaphoreClass SemaphoreClass; #define _abstract_semaphore_unref0(var) ((var == NULL) ? NULL : (var = (abstract_semaphore_unref (var), NULL))) typedef struct _PixbufCacheBaselineFetchJobPrivate PixbufCacheBaselineFetchJobPrivate; typedef struct _PixbufCacheMasterFetchJobPrivate PixbufCacheMasterFetchJobPrivate; +enum { + PIXBUF_CACHE_FETCHED_SIGNAL, + PIXBUF_CACHE_LAST_SIGNAL +}; +static guint pixbuf_cache_signals[PIXBUF_CACHE_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -457,7 +462,7 @@ GType abstract_semaphore_get_type (void) G_GNUC_CONST; GType semaphore_get_type (void) G_GNUC_CONST; BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base); -static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj); +static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj); enum { PIXBUF_CACHE_BASELINE_FETCH_JOB_DUMMY_PROPERTY }; @@ -467,20 +472,20 @@ enum { }; static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base); GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error); -static void pixbuf_cache_finalize (GObject* obj); +static void pixbuf_cache_finalize (GObject * obj); static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_sources_altered ((PixbufCache*) self, items); -#line 477 "PixbufCache.c" +#line 482 "PixbufCache.c" } static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_sources_removed ((PixbufCache*) self, removed); -#line 484 "PixbufCache.c" +#line 489 "PixbufCache.c" } @@ -499,23 +504,23 @@ GType pixbuf_cache_photo_type_get_type (void) { static gpointer _data_collection_ref0 (gpointer self) { #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? data_collection_ref (self) : NULL; -#line 503 "PixbufCache.c" +#line 508 "PixbufCache.c" } PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) { PixbufCache * self = NULL; - SourceCollection* _tmp0_ = NULL; - SourceCollection* _tmp1_ = NULL; - PixbufCachePhotoType _tmp2_ = 0; - Scaling _tmp3_ = {0}; - gint _tmp4_ = 0; - PixbufCacheCacheFilter _tmp5_ = NULL; - void* _tmp5__target = NULL; - gint _tmp6_ = 0; - Workers* _tmp7_ = NULL; - PixbufCachePhotoType _tmp10_ = 0; - SourceCollection* _tmp12_ = NULL; + SourceCollection* _tmp0_; + SourceCollection* _tmp1_; + PixbufCachePhotoType _tmp2_; + Scaling _tmp3_; + gint _tmp4_; + PixbufCacheCacheFilter _tmp5_; + void* _tmp5__target; + gint _tmp6_; + Workers* _tmp7_; + PixbufCachePhotoType _tmp10_; + SourceCollection* _tmp12_; #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL); #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -558,9 +563,9 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source _tmp7_ = pixbuf_cache_background_workers; #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp7_ == NULL) { -#line 562 "PixbufCache.c" - guint _tmp8_ = 0U; - Workers* _tmp9_ = NULL; +#line 567 "PixbufCache.c" + guint _tmp8_; + Workers* _tmp9_; #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp8_ = workers_thread_per_cpu_minus_one (); #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -569,19 +574,19 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source _workers_unref0 (pixbuf_cache_background_workers); #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_background_workers = _tmp9_; -#line 573 "PixbufCache.c" +#line 578 "PixbufCache.c" } #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp10_ = type; #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp10_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) { -#line 579 "PixbufCache.c" - SourceCollection* _tmp11_ = NULL; +#line 584 "PixbufCache.c" + SourceCollection* _tmp11_; #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp11_ = sources; #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0); -#line 585 "PixbufCache.c" +#line 590 "PixbufCache.c" } #line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp12_ = sources; @@ -589,19 +594,19 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self, 0); #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 593 "PixbufCache.c" +#line 598 "PixbufCache.c" } PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) { #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_construct (TYPE_PIXBUF_CACHE, sources, type, scaling, max_count, filter, filter_target); -#line 600 "PixbufCache.c" +#line 605 "PixbufCache.c" } void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) { - Scaling _tmp0_ = {0}; + Scaling _tmp0_; #line 118 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -610,14 +615,14 @@ void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) { *result = _tmp0_; #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 614 "PixbufCache.c" +#line 619 "PixbufCache.c" } GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) { GdkPixbuf* result = NULL; - Photo* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; + Photo* _tmp0_; + GdkPixbuf* _tmp1_; #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); #line 123 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -630,47 +635,47 @@ GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) { result = _tmp1_; #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 634 "PixbufCache.c" +#line 639 "PixbufCache.c" } static gpointer _g_error_copy0 (gpointer self) { #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? g_error_copy (self) : NULL; -#line 641 "PixbufCache.c" +#line 646 "PixbufCache.c" } static gpointer _g_object_ref0 (gpointer self) { #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? g_object_ref (self) : NULL; -#line 648 "PixbufCache.c" +#line 653 "PixbufCache.c" } GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) { GdkPixbuf* result = NULL; - Photo* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + Photo* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; GdkPixbuf* pixbuf = NULL; - Photo* _tmp6_ = NULL; - GdkPixbuf* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; + Photo* _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; PixbufCacheFetchJob* job = NULL; - GeeHashMap* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - PixbufCacheFetchJob* _tmp12_ = NULL; + GeeHashMap* _tmp9_; + Photo* _tmp10_; + gpointer _tmp11_; + PixbufCacheFetchJob* _tmp12_; GdkPixbuf* _tmp22_ = NULL; - Photo* _tmp23_ = NULL; - Scaling _tmp24_ = {0}; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - Photo* _tmp27_ = NULL; - GdkPixbuf* _tmp28_ = NULL; + Photo* _tmp23_; + Scaling _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + Photo* _tmp27_; + GdkPixbuf* _tmp28_; GError * _inner_error_ = NULL; #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); @@ -690,13 +695,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (_tmp2_); #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp4_) { -#line 694 "PixbufCache.c" - Photo* _tmp5_ = NULL; +#line 699 "PixbufCache.c" + Photo* _tmp5_; #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp5_ = photo; #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_decache (self, _tmp5_); -#line 700 "PixbufCache.c" +#line 705 "PixbufCache.c" } #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = photo; @@ -712,7 +717,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) result = pixbuf; #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 716 "PixbufCache.c" +#line 721 "PixbufCache.c" } #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp9_ = self->priv->in_progress; @@ -726,13 +731,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _tmp12_ = job; #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp12_ != NULL) { -#line 730 "PixbufCache.c" - PixbufCacheFetchJob* _tmp13_ = NULL; - PixbufCacheFetchJob* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - PixbufCacheFetchJob* _tmp19_ = NULL; - GdkPixbuf* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; +#line 735 "PixbufCache.c" + PixbufCacheFetchJob* _tmp13_; + PixbufCacheFetchJob* _tmp14_; + GError* _tmp15_; + PixbufCacheFetchJob* _tmp19_; + GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp21_; #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp13_ = job; #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -743,10 +748,10 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _tmp15_ = _tmp14_->err; #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp15_ != NULL) { -#line 747 "PixbufCache.c" - PixbufCacheFetchJob* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - GError* _tmp18_ = NULL; +#line 752 "PixbufCache.c" + PixbufCacheFetchJob* _tmp16_; + GError* _tmp17_; + GError* _tmp18_; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp16_ = job; #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -763,7 +768,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (pixbuf); #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala" return NULL; -#line 767 "PixbufCache.c" +#line 772 "PixbufCache.c" } #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp19_ = job; @@ -779,7 +784,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (pixbuf); #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 783 "PixbufCache.c" +#line 788 "PixbufCache.c" } #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp23_ = photo; @@ -799,7 +804,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _g_object_unref0 (pixbuf); #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" return NULL; -#line 803 "PixbufCache.c" +#line 808 "PixbufCache.c" } #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp26_ = _tmp22_; @@ -823,13 +828,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) _background_job_unref0 (job); #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 827 "PixbufCache.c" +#line 832 "PixbufCache.c" } void pixbuf_cache_drop (PixbufCache* self, Photo* photo) { - Photo* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; + Photo* _tmp0_; + Photo* _tmp1_; #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 165 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -842,38 +847,38 @@ void pixbuf_cache_drop (PixbufCache* self, Photo* photo) { _tmp1_ = photo; #line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_decache (self, _tmp1_); -#line 846 "PixbufCache.c" +#line 851 "PixbufCache.c" } static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self) { #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_on_fetched ((PixbufCache*) self, job); -#line 853 "PixbufCache.c" +#line 858 "PixbufCache.c" } void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force) { - Photo* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + Photo* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - GeeHashMap* _tmp12_ = NULL; - Photo* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + gboolean _tmp7_; + GeeHashMap* _tmp12_; + Photo* _tmp13_; + gboolean _tmp14_; gboolean _tmp15_ = FALSE; - PixbufCacheCacheFilter _tmp16_ = NULL; - void* _tmp16__target = NULL; + PixbufCacheCacheFilter _tmp16_; + void* _tmp16__target; PixbufCacheFetchJob* job = NULL; - PixbufCachePhotoType _tmp20_ = 0; - GeeHashMap* _tmp30_ = NULL; - Photo* _tmp31_ = NULL; - PixbufCacheFetchJob* _tmp32_ = NULL; - Workers* _tmp33_ = NULL; - PixbufCacheFetchJob* _tmp34_ = NULL; + PixbufCachePhotoType _tmp20_; + GeeHashMap* _tmp30_; + Photo* _tmp31_; + PixbufCacheFetchJob* _tmp32_; + Workers* _tmp33_; + PixbufCacheFetchJob* _tmp34_; #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -892,22 +897,22 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri _g_object_unref0 (_tmp2_); #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp4_) { -#line 896 "PixbufCache.c" - Photo* _tmp5_ = NULL; +#line 901 "PixbufCache.c" + Photo* _tmp5_; #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp5_ = photo; #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_decache (self, _tmp5_); -#line 902 "PixbufCache.c" +#line 907 "PixbufCache.c" } #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp7_ = force; #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (!_tmp7_) { -#line 908 "PixbufCache.c" - GeeHashMap* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; +#line 913 "PixbufCache.c" + GeeHashMap* _tmp8_; + Photo* _tmp9_; + gboolean _tmp10_; #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp8_ = self->priv->cache; #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -916,23 +921,23 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri _tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_); #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = _tmp10_; -#line 920 "PixbufCache.c" +#line 925 "PixbufCache.c" } else { #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = FALSE; -#line 924 "PixbufCache.c" +#line 929 "PixbufCache.c" } #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp6_) { -#line 928 "PixbufCache.c" - Photo* _tmp11_ = NULL; +#line 933 "PixbufCache.c" + Photo* _tmp11_; #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp11_ = photo; #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_prioritize (self, _tmp11_); #line 180 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 936 "PixbufCache.c" +#line 941 "PixbufCache.c" } #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp12_ = self->priv->in_progress; @@ -944,7 +949,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri if (_tmp14_) { #line 184 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 948 "PixbufCache.c" +#line 953 "PixbufCache.c" } #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp16_ = self->priv->filter; @@ -952,11 +957,11 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri _tmp16__target = self->priv->filter_target; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp16_ != NULL) { -#line 956 "PixbufCache.c" - PixbufCacheCacheFilter _tmp17_ = NULL; - void* _tmp17__target = NULL; - Photo* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; +#line 961 "PixbufCache.c" + PixbufCacheCacheFilter _tmp17_; + void* _tmp17__target; + Photo* _tmp18_; + gboolean _tmp19_; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp17_ = self->priv->filter; #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -967,17 +972,17 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri _tmp19_ = _tmp17_ (_tmp18_, _tmp17__target); #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp15_ = !_tmp19_; -#line 971 "PixbufCache.c" +#line 976 "PixbufCache.c" } else { #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp15_ = FALSE; -#line 975 "PixbufCache.c" +#line 980 "PixbufCache.c" } #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp15_) { #line 187 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 981 "PixbufCache.c" +#line 986 "PixbufCache.c" } #line 189 "/home/jens/Source/shotwell/src/PixbufCache.vala" job = NULL; @@ -987,12 +992,12 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri switch (_tmp20_) { #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" case PIXBUF_CACHE_PHOTO_TYPE_BASELINE: -#line 991 "PixbufCache.c" +#line 996 "PixbufCache.c" { - BackgroundJobJobPriority _tmp21_ = 0; - Photo* _tmp22_ = NULL; - Scaling _tmp23_ = {0}; - PixbufCacheBaselineFetchJob* _tmp24_ = NULL; + BackgroundJobJobPriority _tmp21_; + Photo* _tmp22_; + Scaling _tmp23_; + PixbufCacheBaselineFetchJob* _tmp24_; #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp21_ = priority; #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1007,16 +1012,16 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri job = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); #line 193 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1011 "PixbufCache.c" +#line 1016 "PixbufCache.c" } #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala" case PIXBUF_CACHE_PHOTO_TYPE_MASTER: -#line 1015 "PixbufCache.c" +#line 1020 "PixbufCache.c" { - BackgroundJobJobPriority _tmp25_ = 0; - Photo* _tmp26_ = NULL; - Scaling _tmp27_ = {0}; - PixbufCacheMasterFetchJob* _tmp28_ = NULL; + BackgroundJobJobPriority _tmp25_; + Photo* _tmp26_; + Scaling _tmp27_; + PixbufCacheMasterFetchJob* _tmp28_; #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp25_ = priority; #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1031,16 +1036,16 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri job = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); #line 197 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1035 "PixbufCache.c" +#line 1040 "PixbufCache.c" } default: { - PixbufCachePhotoType _tmp29_ = 0; + PixbufCachePhotoType _tmp29_; #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp29_ = self->priv->type; #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp29_); -#line 1044 "PixbufCache.c" +#line 1049 "PixbufCache.c" } } #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1059,7 +1064,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri workers_enqueue (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1063 "PixbufCache.c" +#line 1068 "PixbufCache.c" } @@ -1068,11 +1073,11 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_COLLECTION (photos)); -#line 1072 "PixbufCache.c" +#line 1077 "PixbufCache.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = photos; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1081,15 +1086,15 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg _photo_it = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1085 "PixbufCache.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1090 "PixbufCache.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; Photo* photo = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - Photo* _tmp6_ = NULL; - BackgroundJobJobPriority _tmp7_ = 0; - gboolean _tmp8_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + Photo* _tmp6_; + BackgroundJobJobPriority _tmp7_; + gboolean _tmp8_; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp2_ = _photo_it; #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1098,7 +1103,7 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg if (!_tmp3_) { #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1102 "PixbufCache.c" +#line 1107 "PixbufCache.c" } #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = _photo_it; @@ -1116,11 +1121,11 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg pixbuf_cache_prefetch (self, _tmp6_, _tmp7_, _tmp8_); #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); -#line 1120 "PixbufCache.c" +#line 1125 "PixbufCache.c" } #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_photo_it); -#line 1124 "PixbufCache.c" +#line 1129 "PixbufCache.c" } } @@ -1130,14 +1135,14 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (PIXBUF_CACHE_IS_PIXBUF_CACHE_BATCH (batch)); -#line 1134 "PixbufCache.c" +#line 1139 "PixbufCache.c" { GeeIterator* _priority_it = NULL; - PixbufCachePixbufCacheBatch* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + PixbufCachePixbufCacheBatch* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeIterator* _tmp3_; + GeeIterator* _tmp4_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = batch; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1154,12 +1159,12 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch _priority_it = _tmp4_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1158 "PixbufCache.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 1163 "PixbufCache.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; BackgroundJobJobPriority priority = 0; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp5_ = _priority_it; #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1168,7 +1173,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch if (!_tmp6_) { #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1172 "PixbufCache.c" +#line 1177 "PixbufCache.c" } #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp7_ = _priority_it; @@ -1176,15 +1181,15 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch _tmp8_ = gee_iterator_get (_tmp7_); #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" priority = (BackgroundJobJobPriority) ((gintptr) _tmp8_); -#line 1180 "PixbufCache.c" +#line 1185 "PixbufCache.c" { GeeIterator* _photo_it = NULL; - PixbufCachePixbufCacheBatch* _tmp9_ = NULL; - BackgroundJobJobPriority _tmp10_ = 0; - GeeCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + PixbufCachePixbufCacheBatch* _tmp9_; + BackgroundJobJobPriority _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; + GeeIterator* _tmp14_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp9_ = batch; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1203,15 +1208,15 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch _photo_it = _tmp14_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1207 "PixbufCache.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 1212 "PixbufCache.c" + GeeIterator* _tmp15_; + gboolean _tmp16_; Photo* photo = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; - Photo* _tmp19_ = NULL; - BackgroundJobJobPriority _tmp20_ = 0; - gboolean _tmp21_ = FALSE; + GeeIterator* _tmp17_; + gpointer _tmp18_; + Photo* _tmp19_; + BackgroundJobJobPriority _tmp20_; + gboolean _tmp21_; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp15_ = _photo_it; #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1220,7 +1225,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch if (!_tmp16_) { #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1224 "PixbufCache.c" +#line 1229 "PixbufCache.c" } #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp17_ = _photo_it; @@ -1238,16 +1243,16 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch pixbuf_cache_prefetch (self, _tmp19_, _tmp20_, _tmp21_); #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (photo); -#line 1242 "PixbufCache.c" +#line 1247 "PixbufCache.c" } #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_photo_it); -#line 1246 "PixbufCache.c" +#line 1251 "PixbufCache.c" } } #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_priority_it); -#line 1251 "PixbufCache.c" +#line 1256 "PixbufCache.c" } } @@ -1255,16 +1260,16 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) { gboolean result = FALSE; PixbufCacheFetchJob* job = NULL; - GeeHashMap* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - PixbufCacheFetchJob* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + Photo* _tmp1_; + gpointer _tmp2_; + PixbufCacheFetchJob* _tmp3_; gboolean removed = FALSE; - GeeHashMap* _tmp4_ = NULL; - Photo* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - PixbufCacheFetchJob* _tmp8_ = NULL; + GeeHashMap* _tmp4_; + Photo* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + PixbufCacheFetchJob* _tmp8_; #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), FALSE); #line 224 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1287,7 +1292,7 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) { _background_job_unref0 (job); #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1291 "PixbufCache.c" +#line 1296 "PixbufCache.c" } #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = self->priv->in_progress; @@ -1311,23 +1316,23 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) { _background_job_unref0 (job); #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1315 "PixbufCache.c" +#line 1320 "PixbufCache.c" } void pixbuf_cache_cancel_all (PixbufCache* self) { - GeeHashMap* _tmp11_ = NULL; + GeeHashMap* _tmp11_; #line 242 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); -#line 1323 "PixbufCache.c" +#line 1328 "PixbufCache.c" { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->in_progress; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1346,13 +1351,13 @@ void pixbuf_cache_cancel_all (PixbufCache* self) { _job_it = _tmp5_; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1350 "PixbufCache.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1355 "PixbufCache.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; PixbufCacheFetchJob* job = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - PixbufCacheFetchJob* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + PixbufCacheFetchJob* _tmp10_; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = _job_it; #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1361,7 +1366,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) { if (!_tmp7_) { #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1365 "PixbufCache.c" +#line 1370 "PixbufCache.c" } #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp8_ = _job_it; @@ -1375,44 +1380,44 @@ void pixbuf_cache_cancel_all (PixbufCache* self) { background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1379 "PixbufCache.c" +#line 1384 "PixbufCache.c" } #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_job_it); -#line 1383 "PixbufCache.c" +#line 1388 "PixbufCache.c" } #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp11_ = self->priv->in_progress; #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala" gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 1389 "PixbufCache.c" +#line 1394 "PixbufCache.c" } static gpointer _background_job_ref0 (gpointer self) { #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self ? background_job_ref (self) : NULL; -#line 1396 "PixbufCache.c" +#line 1401 "PixbufCache.c" } static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) { PixbufCacheFetchJob* job = NULL; - BackgroundJob* _tmp0_ = NULL; - PixbufCacheFetchJob* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - PixbufCacheFetchJob* _tmp3_ = NULL; - Photo* _tmp4_ = NULL; - PixbufCacheFetchJob* _tmp5_ = NULL; - GError* _tmp6_ = NULL; - PixbufCacheFetchJob* _tmp20_ = NULL; - Photo* _tmp21_ = NULL; - PixbufCacheFetchJob* _tmp22_ = NULL; - GdkPixbuf* _tmp23_ = NULL; - PixbufCacheFetchJob* _tmp24_ = NULL; - Photo* _tmp25_ = NULL; - PixbufCacheFetchJob* _tmp26_ = NULL; - GdkPixbuf* _tmp27_ = NULL; + BackgroundJob* _tmp0_; + PixbufCacheFetchJob* _tmp1_; + GeeHashMap* _tmp2_; + PixbufCacheFetchJob* _tmp3_; + Photo* _tmp4_; + PixbufCacheFetchJob* _tmp5_; + GError* _tmp6_; + PixbufCacheFetchJob* _tmp20_; + Photo* _tmp21_; + PixbufCacheFetchJob* _tmp22_; + GdkPixbuf* _tmp23_; + PixbufCacheFetchJob* _tmp24_; + Photo* _tmp25_; + PixbufCacheFetchJob* _tmp26_; + GdkPixbuf* _tmp27_; #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1437,20 +1442,20 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) { _tmp6_ = _tmp5_->err; #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp6_ != NULL) { -#line 1441 "PixbufCache.c" - PixbufCacheFetchJob* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - PixbufCacheFetchJob* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - PixbufCacheFetchJob* _tmp13_ = NULL; - GError* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - PixbufCacheFetchJob* _tmp16_ = NULL; - Photo* _tmp17_ = NULL; - PixbufCacheFetchJob* _tmp18_ = NULL; - GError* _tmp19_ = NULL; +#line 1446 "PixbufCache.c" + PixbufCacheFetchJob* _tmp7_; + GdkPixbuf* _tmp8_; + PixbufCacheFetchJob* _tmp9_; + Photo* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + PixbufCacheFetchJob* _tmp13_; + GError* _tmp14_; + const gchar* _tmp15_; + PixbufCacheFetchJob* _tmp16_; + Photo* _tmp17_; + PixbufCacheFetchJob* _tmp18_; + GError* _tmp19_; #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp7_ = job; #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1484,12 +1489,12 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) { #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp19_ = _tmp18_->err; #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_emit_by_name (self, "fetched", _tmp17_, NULL, _tmp19_); + g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp17_, NULL, _tmp19_); #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 1493 "PixbufCache.c" +#line 1498 "PixbufCache.c" } #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp20_ = job; @@ -1510,10 +1515,10 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) { #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp27_ = _tmp26_->pixbuf; #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_emit_by_name (self, "fetched", _tmp25_, _tmp27_, NULL); + g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp25_, _tmp27_, NULL); #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 1517 "PixbufCache.c" +#line 1522 "PixbufCache.c" } @@ -1522,15 +1527,15 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 1526 "PixbufCache.c" +#line 1531 "PixbufCache.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = map; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1549,26 +1554,26 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _object_it = _tmp5_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1553 "PixbufCache.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1558 "PixbufCache.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - Alteration* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; Photo* photo = NULL; - DataObject* _tmp16_ = NULL; - Photo* _tmp17_ = NULL; - GeeHashMap* _tmp18_ = NULL; - Photo* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - Photo* _tmp30_ = NULL; - Photo* _tmp31_ = NULL; + DataObject* _tmp16_; + Photo* _tmp17_; + GeeHashMap* _tmp18_; + Photo* _tmp19_; + gboolean _tmp20_; + Photo* _tmp30_; + Photo* _tmp31_; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = _object_it; #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1577,7 +1582,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { if (!_tmp7_) { #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1581 "PixbufCache.c" +#line 1586 "PixbufCache.c" } #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp8_ = _object_it; @@ -1605,7 +1610,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _g_object_unref0 (object); #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala" continue; -#line 1609 "PixbufCache.c" +#line 1614 "PixbufCache.c" } #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp16_ = object; @@ -1621,13 +1626,13 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _tmp20_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_); #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp20_) { -#line 1625 "PixbufCache.c" - GeeHashMap* _tmp21_ = NULL; - Photo* _tmp22_ = NULL; - gpointer _tmp23_ = NULL; - PixbufCacheFetchJob* _tmp24_ = NULL; - GeeHashMap* _tmp25_ = NULL; - Photo* _tmp26_ = NULL; +#line 1630 "PixbufCache.c" + GeeHashMap* _tmp21_; + Photo* _tmp22_; + gpointer _tmp23_; + PixbufCacheFetchJob* _tmp24_; + GeeHashMap* _tmp25_; + Photo* _tmp26_; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp21_ = self->priv->in_progress; #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1646,11 +1651,11 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _tmp26_ = photo; #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala" gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, NULL); -#line 1650 "PixbufCache.c" +#line 1655 "PixbufCache.c" } else { - GeeHashMap* _tmp27_ = NULL; - Photo* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + GeeHashMap* _tmp27_; + Photo* _tmp28_; + gboolean _tmp29_; #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp27_ = self->priv->cache; #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1665,7 +1670,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _g_object_unref0 (object); #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala" continue; -#line 1669 "PixbufCache.c" +#line 1674 "PixbufCache.c" } } #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1680,11 +1685,11 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) { _g_object_unref0 (photo); #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); -#line 1684 "PixbufCache.c" +#line 1689 "PixbufCache.c" } #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_object_it); -#line 1688 "PixbufCache.c" +#line 1693 "PixbufCache.c" } } @@ -1694,11 +1699,11 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 1698 "PixbufCache.c" +#line 1703 "PixbufCache.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = removed; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1707,17 +1712,17 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem _object_it = _tmp1_; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1711 "PixbufCache.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1716 "PixbufCache.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; Photo* photo = NULL; - DataObject* _tmp6_ = NULL; - Photo* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; + DataObject* _tmp6_; + Photo* _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp2_ = _object_it; #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1726,7 +1731,7 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem if (!_tmp3_) { #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1730 "PixbufCache.c" +#line 1735 "PixbufCache.c" } #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = _object_it; @@ -1752,11 +1757,11 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem _g_object_unref0 (photo); #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (object); -#line 1756 "PixbufCache.c" +#line 1761 "PixbufCache.c" } #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_object_it); -#line 1760 "PixbufCache.c" +#line 1765 "PixbufCache.c" } } @@ -1764,10 +1769,10 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) { GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; - GeeHashMap* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + Photo* _tmp1_; + gpointer _tmp2_; + GdkPixbuf* _tmp3_; #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL); #line 314 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1784,29 +1789,29 @@ static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) { _tmp3_ = pixbuf; #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp3_ != NULL) { -#line 1788 "PixbufCache.c" - Photo* _tmp4_ = NULL; +#line 1793 "PixbufCache.c" + Photo* _tmp4_; #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = photo; #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_prioritize (self, _tmp4_); -#line 1794 "PixbufCache.c" +#line 1799 "PixbufCache.c" } #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala" result = pixbuf; #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 1800 "PixbufCache.c" +#line 1805 "PixbufCache.c" } static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) { gint index = 0; - GeeArrayList* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeArrayList* _tmp0_; + Photo* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 323 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1827,13 +1832,13 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) { _tmp4_ = index; #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp4_ > 0) { -#line 1831 "PixbufCache.c" - GeeArrayList* _tmp5_ = NULL; - gint _tmp6_ = 0; - gpointer _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; +#line 1836 "PixbufCache.c" + GeeArrayList* _tmp5_; + gint _tmp6_; + gpointer _tmp7_; + Photo* _tmp8_; + GeeArrayList* _tmp9_; + Photo* _tmp10_; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp5_ = self->priv->lru; #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1850,24 +1855,24 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) { _tmp10_ = photo; #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala" gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp10_); -#line 1854 "PixbufCache.c" +#line 1859 "PixbufCache.c" } } static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf) { - Photo* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GeeArrayList* _tmp4_ = NULL; - Photo* _tmp5_ = NULL; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; - GeeHashMap* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; + Photo* _tmp0_; + GeeHashMap* _tmp1_; + Photo* _tmp2_; + GdkPixbuf* _tmp3_; + GeeArrayList* _tmp4_; + Photo* _tmp5_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gint _tmp22_; + GeeHashMap* _tmp23_; + gint _tmp24_; + gint _tmp25_; #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1894,23 +1899,23 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp5_); #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 1898 "PixbufCache.c" - GeeArrayList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 1903 "PixbufCache.c" + GeeArrayList* _tmp6_; + gint _tmp7_; + gint _tmp8_; + gint _tmp9_; Photo* cached_photo = NULL; - GeeArrayList* _tmp10_ = NULL; - GeeArrayList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - Photo* _tmp15_ = NULL; + GeeArrayList* _tmp10_; + GeeArrayList* _tmp11_; + gint _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + Photo* _tmp15_; gboolean removed = FALSE; - GeeHashMap* _tmp16_ = NULL; - Photo* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; + GeeHashMap* _tmp16_; + Photo* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = self->priv->lru; #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1923,7 +1928,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi if (!(_tmp8_ > _tmp9_)) { #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 1927 "PixbufCache.c" +#line 1932 "PixbufCache.c" } #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp10_ = self->priv->lru; @@ -1955,7 +1960,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi _vala_assert (_tmp19_, "removed"); #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (cached_photo); -#line 1959 "PixbufCache.c" +#line 1964 "PixbufCache.c" } #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp20_ = self->priv->lru; @@ -1971,19 +1976,19 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi _tmp25_ = _tmp24_; #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala" _vala_assert (_tmp22_ == _tmp25_, "lru.size == cache.size"); -#line 1975 "PixbufCache.c" +#line 1980 "PixbufCache.c" } static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { - GeeHashMap* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + Photo* _tmp1_; + gboolean _tmp2_; gboolean removed = FALSE; - GeeArrayList* _tmp6_ = NULL; - Photo* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + GeeArrayList* _tmp6_; + Photo* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_if_fail (IS_PIXBUF_CACHE (self)); #line 351 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -1996,10 +2001,10 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL); #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (!_tmp2_) { -#line 2000 "PixbufCache.c" - GeeArrayList* _tmp3_ = NULL; - Photo* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 2005 "PixbufCache.c" + GeeArrayList* _tmp3_; + Photo* _tmp4_; + gboolean _tmp5_; #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp3_ = self->priv->lru; #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2010,7 +2015,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { _vala_assert (!_tmp5_, "!lru.contains(photo)"); #line 355 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2014 "PixbufCache.c" +#line 2019 "PixbufCache.c" } #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp6_ = self->priv->lru; @@ -2024,7 +2029,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) { _tmp9_ = removed; #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala" _vala_assert (_tmp9_, "removed"); -#line 2028 "PixbufCache.c" +#line 2033 "PixbufCache.c" } @@ -2043,19 +2048,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data2 = param_values->data[0].v_pointer; -#line 2047 "PixbufCache.c" +#line 2052 "PixbufCache.c" } else { #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" data2 = closure->data; -#line 2053 "PixbufCache.c" +#line 2058 "PixbufCache.c" } #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_pointer (param_values + 3), data2); -#line 2059 "PixbufCache.c" +#line 2064 "PixbufCache.c" } @@ -2065,21 +2070,21 @@ PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType ob 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" +#line 2074 "PixbufCache.c" } PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void) { #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_pixbuf_cache_batch_construct (PIXBUF_CACHE_TYPE_PIXBUF_CACHE_BATCH); -#line 2076 "PixbufCache.c" +#line 2081 "PixbufCache.c" } static void pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) { #line 15 "/home/jens/Source/shotwell/src/PixbufCache.vala" pixbuf_cache_pixbuf_cache_batch_parent_class = g_type_class_peek_parent (klass); -#line 2083 "PixbufCache.c" +#line 2088 "PixbufCache.c" } @@ -2101,17 +2106,17 @@ GType pixbuf_cache_pixbuf_cache_batch_get_type (void) { static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { PixbufCacheFetchJob* self = NULL; - PixbufCache* _tmp0_ = NULL; - CompletionCallback _tmp1_ = NULL; - void* _tmp1__target = NULL; - GCancellable* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - Semaphore* _tmp4_ = NULL; - Semaphore* _tmp5_ = NULL; - BackgroundJobJobPriority _tmp6_ = 0; - Photo* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - Scaling _tmp9_ = {0}; + PixbufCache* _tmp0_; + CompletionCallback _tmp1_; + void* _tmp1__target; + GCancellable* _tmp2_; + GCancellable* _tmp3_; + Semaphore* _tmp4_; + Semaphore* _tmp5_; + BackgroundJobJobPriority _tmp6_; + Photo* _tmp7_; + Photo* _tmp8_; + Scaling _tmp9_; #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2156,14 +2161,14 @@ static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, self->scaling = _tmp9_; #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2160 "PixbufCache.c" +#line 2165 "PixbufCache.c" } static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base) { PixbufCacheFetchJob * self; BackgroundJobJobPriority result = 0; - BackgroundJobJobPriority _tmp0_ = 0; + BackgroundJobJobPriority _tmp0_; #line 37 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2172,7 +2177,7 @@ static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (Backgr result = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala" return result; -#line 2176 "PixbufCache.c" +#line 2181 "PixbufCache.c" } @@ -2182,8 +2187,8 @@ 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 = (BackgroundJobJobPriority (*)(BackgroundJob*)) pixbuf_cache_fetch_job_real_get_priority; -#line 2187 "PixbufCache.c" + ((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) pixbuf_cache_fetch_job_real_get_priority; +#line 2192 "PixbufCache.c" } @@ -2192,11 +2197,11 @@ static void pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) { self->pixbuf = NULL; #line 26 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->err = NULL; -#line 2196 "PixbufCache.c" +#line 2201 "PixbufCache.c" } -static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj) { +static void pixbuf_cache_fetch_job_finalize (BackgroundJob * obj) { PixbufCacheFetchJob * self; #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob); @@ -2208,7 +2213,7 @@ static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj) { _g_error_free0 (self->err); #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala" BACKGROUND_JOB_CLASS (pixbuf_cache_fetch_job_parent_class)->finalize (obj); -#line 2212 "PixbufCache.c" +#line 2217 "PixbufCache.c" } @@ -2226,12 +2231,12 @@ static GType pixbuf_cache_fetch_job_get_type (void) { static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { PixbufCacheBaselineFetchJob* self = NULL; - PixbufCache* _tmp0_ = NULL; - BackgroundJobJobPriority _tmp1_ = 0; - Photo* _tmp2_ = NULL; - Scaling _tmp3_ = {0}; - CompletionCallback _tmp4_ = NULL; - void* _tmp4__target = NULL; + PixbufCache* _tmp0_; + BackgroundJobJobPriority _tmp1_; + Photo* _tmp2_; + Scaling _tmp3_; + CompletionCallback _tmp4_; + void* _tmp4__target; #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2254,14 +2259,14 @@ static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (G self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2258 "PixbufCache.c" +#line 2263 "PixbufCache.c" } static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_baseline_fetch_job_construct (PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target); -#line 2265 "PixbufCache.c" +#line 2270 "PixbufCache.c" } @@ -2270,13 +2275,13 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { GError * _inner_error_ = NULL; #line 48 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, PixbufCacheBaselineFetchJob); -#line 2274 "PixbufCache.c" +#line 2279 "PixbufCache.c" { GdkPixbuf* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Scaling _tmp2_ = {0}; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; + Photo* _tmp1_; + Scaling _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->photo; #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2287,8 +2292,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { _tmp0_ = _tmp3_; #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2291 "PixbufCache.c" - goto __catch453_g_error; +#line 2296 "PixbufCache.c" + goto __catch454_g_error; } #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = _tmp0_; @@ -2300,14 +2305,14 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_tmp0_); -#line 2304 "PixbufCache.c" +#line 2309 "PixbufCache.c" } - goto __finally453; - __catch453_g_error: + goto __finally454; + __catch454_g_error: { GError* err = NULL; - GError* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + GError* _tmp5_; + GError* _tmp6_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" err = _inner_error_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2322,9 +2327,9 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_; #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_error_free0 (err); -#line 2326 "PixbufCache.c" +#line 2331 "PixbufCache.c" } - __finally453: + __finally454: #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2333,7 +2338,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2337 "PixbufCache.c" +#line 2342 "PixbufCache.c" } } @@ -2342,8 +2347,8 @@ 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 = (void (*)(BackgroundJob*)) pixbuf_cache_baseline_fetch_job_real_execute; -#line 2347 "PixbufCache.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_baseline_fetch_job_real_execute; +#line 2352 "PixbufCache.c" } @@ -2365,12 +2370,12 @@ static GType pixbuf_cache_baseline_fetch_job_get_type (void) { static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { PixbufCacheMasterFetchJob* self = NULL; - PixbufCache* _tmp0_ = NULL; - BackgroundJobJobPriority _tmp1_ = 0; - Photo* _tmp2_ = NULL; - Scaling _tmp3_ = {0}; - CompletionCallback _tmp4_ = NULL; - void* _tmp4__target = NULL; + PixbufCache* _tmp0_; + BackgroundJobJobPriority _tmp1_; + Photo* _tmp2_; + Scaling _tmp3_; + CompletionCallback _tmp4_; + void* _tmp4__target; #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_return_val_if_fail (IS_PIXBUF_CACHE (owner), NULL); #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2393,14 +2398,14 @@ static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target); #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" return self; -#line 2397 "PixbufCache.c" +#line 2402 "PixbufCache.c" } static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) { #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala" return pixbuf_cache_master_fetch_job_construct (PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target); -#line 2404 "PixbufCache.c" +#line 2409 "PixbufCache.c" } @@ -2409,13 +2414,13 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { GError * _inner_error_ = NULL; #line 63 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, PixbufCacheMasterFetchJob); -#line 2413 "PixbufCache.c" +#line 2418 "PixbufCache.c" { GdkPixbuf* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Scaling _tmp2_ = {0}; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; + Photo* _tmp1_; + Scaling _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->photo; #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2426,8 +2431,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { _tmp0_ = _tmp3_; #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2430 "PixbufCache.c" - goto __catch454_g_error; +#line 2435 "PixbufCache.c" + goto __catch455_g_error; } #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp4_ = _tmp0_; @@ -2439,14 +2444,14 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_tmp0_); -#line 2443 "PixbufCache.c" +#line 2448 "PixbufCache.c" } - goto __finally454; - __catch454_g_error: + goto __finally455; + __catch455_g_error: { GError* err = NULL; - GError* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + GError* _tmp5_; + GError* _tmp6_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" err = _inner_error_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2461,9 +2466,9 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_; #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_error_free0 (err); -#line 2465 "PixbufCache.c" +#line 2470 "PixbufCache.c" } - __finally454: + __finally455: #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2472,7 +2477,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala" return; -#line 2476 "PixbufCache.c" +#line 2481 "PixbufCache.c" } } @@ -2481,8 +2486,8 @@ 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 = (void (*)(BackgroundJob*)) pixbuf_cache_master_fetch_job_real_execute; -#line 2486 "PixbufCache.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) pixbuf_cache_master_fetch_job_real_execute; +#line 2491 "PixbufCache.c" } @@ -2510,15 +2515,15 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) { #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" - g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER); -#line 2515 "PixbufCache.c" + pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL] = g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER); +#line 2520 "PixbufCache.c" } static void pixbuf_cache_instance_init (PixbufCache * self) { - GeeHashMap* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GeeArrayList* _tmp1_; + GeeHashMap* _tmp2_; #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" @@ -2533,31 +2538,31 @@ static void pixbuf_cache_instance_init (PixbufCache * self) { _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" +#line 2542 "PixbufCache.c" } -static void pixbuf_cache_finalize (GObject* obj) { +static void pixbuf_cache_finalize (GObject * obj) { PixbufCache * self; - PixbufCachePhotoType _tmp0_ = 0; - SourceCollection* _tmp3_ = NULL; - guint _tmp4_ = 0U; + PixbufCachePhotoType _tmp0_; + SourceCollection* _tmp3_; + guint _tmp4_; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_CACHE, PixbufCache); #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp0_ = self->priv->type; #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala" if (_tmp0_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) { -#line 2552 "PixbufCache.c" - SourceCollection* _tmp1_ = NULL; - guint _tmp2_ = 0U; +#line 2557 "PixbufCache.c" + SourceCollection* _tmp1_; + guint _tmp2_; #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp1_ = self->priv->sources; #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE); #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self); -#line 2561 "PixbufCache.c" +#line 2566 "PixbufCache.c" } #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp3_ = self->priv->sources; @@ -2565,15 +2570,15 @@ static void pixbuf_cache_finalize (GObject* obj) { g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self); -#line 2569 "PixbufCache.c" +#line 2574 "PixbufCache.c" { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + GeeHashMap* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp5_ = self->priv->in_progress; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2592,13 +2597,13 @@ static void pixbuf_cache_finalize (GObject* obj) { _job_it = _tmp10_; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" while (TRUE) { -#line 2596 "PixbufCache.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 2601 "PixbufCache.c" + GeeIterator* _tmp11_; + gboolean _tmp12_; PixbufCacheFetchJob* job = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - PixbufCacheFetchJob* _tmp15_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + PixbufCacheFetchJob* _tmp15_; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp11_ = _job_it; #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" @@ -2607,7 +2612,7 @@ static void pixbuf_cache_finalize (GObject* obj) { if (!_tmp12_) { #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" break; -#line 2611 "PixbufCache.c" +#line 2616 "PixbufCache.c" } #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _tmp13_ = _job_it; @@ -2621,11 +2626,11 @@ static void pixbuf_cache_finalize (GObject* obj) { background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _background_job_unref0 (job); -#line 2625 "PixbufCache.c" +#line 2630 "PixbufCache.c" } #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala" _g_object_unref0 (_job_it); -#line 2629 "PixbufCache.c" +#line 2634 "PixbufCache.c" } #line 74 "/home/jens/Source/shotwell/src/PixbufCache.vala" _data_collection_unref0 (self->priv->sources); @@ -2637,7 +2642,7 @@ static void pixbuf_cache_finalize (GObject* obj) { _g_object_unref0 (self->priv->in_progress); #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" G_OBJECT_CLASS (pixbuf_cache_parent_class)->finalize (obj); -#line 2641 "PixbufCache.c" +#line 2646 "PixbufCache.c" } |