From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/ThumbnailCache.c | 1214 +++++++++++++++++++++++++------------------------- 1 file changed, 602 insertions(+), 612 deletions(-) (limited to 'src/ThumbnailCache.c') diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c index 0dac00c..5ef8ed9 100644 --- a/src/ThumbnailCache.c +++ b/src/ThumbnailCache.c @@ -1,4 +1,4 @@ -/* ThumbnailCache.c generated by valac 0.34.7, the Vala compiler +/* ThumbnailCache.c generated by valac 0.36.6, the Vala compiler * generated from ThumbnailCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -472,7 +472,7 @@ Thumbnails* thumbnails_construct (GType object_type); void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf); void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size); GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size); -static void thumbnails_finalize (Thumbnails* obj); +static void thumbnails_finalize (Thumbnails * obj); GType thumbnail_cache_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; static gpointer thumbnail_cache_image_data_ref (gpointer instance); @@ -618,7 +618,7 @@ void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQual enum { THUMBNAIL_CACHE_IMAGE_DATA_DUMMY_PROPERTY }; -static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj); +static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj); enum { THUMBNAIL_CACHE_ASYNC_FETCH_JOB_DUMMY_PROPERTY }; @@ -639,8 +639,8 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj); -static void thumbnail_cache_finalize (GObject* obj); +static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj); +static void thumbnail_cache_finalize (GObject * obj); Thumbnails* thumbnails_construct (GType object_type) { @@ -661,9 +661,9 @@ Thumbnails* thumbnails_new (void) { void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbuf) { - GeeHashMap* _tmp0_ = NULL; - ThumbnailCacheSize _tmp1_ = 0; - GdkPixbuf* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + ThumbnailCacheSize _tmp1_; + GdkPixbuf* _tmp2_; #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (self)); #line 14 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -681,8 +681,8 @@ void thumbnails_set (Thumbnails* self, ThumbnailCacheSize size, GdkPixbuf* pixbu void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size) { - GeeHashMap* _tmp0_ = NULL; - ThumbnailCacheSize _tmp1_ = 0; + GeeHashMap* _tmp0_; + ThumbnailCacheSize _tmp1_; #line 18 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (self)); #line 19 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -697,9 +697,9 @@ void thumbnails_remove (Thumbnails* self, ThumbnailCacheSize size) { GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size) { GdkPixbuf* result = NULL; - GeeHashMap* _tmp0_ = NULL; - ThumbnailCacheSize _tmp1_ = 0; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + ThumbnailCacheSize _tmp1_; + gpointer _tmp2_; #line 22 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAILS (self), NULL); #line 23 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -758,7 +758,7 @@ static gchar* value_thumbnails_collect_value (GValue* value, guint n_collect_val #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (collect_values[0].v_pointer) { #line 761 "ThumbnailCache.c" - Thumbnails* object; + Thumbnails * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (object->parent_instance.g_class == NULL) { @@ -785,7 +785,7 @@ static gchar* value_thumbnails_collect_value (GValue* value, guint n_collect_val static gchar* value_thumbnails_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - Thumbnails** object_p; + Thumbnails ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!object_p) { @@ -837,7 +837,7 @@ gpointer value_get_thumbnails (const GValue* value) { void value_set_thumbnails (GValue* value, gpointer v_object) { - Thumbnails* old; + Thumbnails * old; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS)); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -868,7 +868,7 @@ void value_set_thumbnails (GValue* value, gpointer v_object) { void value_take_thumbnails (GValue* value, gpointer v_object) { - Thumbnails* old; + Thumbnails * old; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THUMBNAILS)); #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -908,7 +908,7 @@ static void thumbnails_class_init (ThumbnailsClass * klass) { static void thumbnails_instance_init (Thumbnails * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv = THUMBNAILS_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -921,7 +921,7 @@ static void thumbnails_instance_init (Thumbnails * self) { } -static void thumbnails_finalize (Thumbnails* obj) { +static void thumbnails_finalize (Thumbnails * obj) { Thumbnails * self; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAILS, Thumbnails); @@ -948,7 +948,7 @@ GType thumbnails_get_type (void) { gpointer thumbnails_ref (gpointer instance) { - Thumbnails* self; + Thumbnails * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_atomic_int_inc (&self->ref_count); @@ -959,7 +959,7 @@ gpointer thumbnails_ref (gpointer instance) { void thumbnails_unref (gpointer instance) { - Thumbnails* self; + Thumbnails * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -983,7 +983,7 @@ gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self) { void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result) { - gint _tmp0_ = 0; + gint _tmp0_; Scaling _tmp1_ = {0}; #line 46 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = thumbnail_cache_size_get_scale (self); @@ -1000,8 +1000,8 @@ void thumbnail_cache_size_get_scaling (ThumbnailCacheSize self, Scaling* result) ThumbnailCacheSize thumbnail_cache_size_get_best_size (gint scale) { ThumbnailCacheSize result = 0; ThumbnailCacheSize _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp1_; + gint _tmp2_; #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = scale; #line 50 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1038,15 +1038,15 @@ GType thumbnail_cache_size_get_type (void) { static ThumbnailCache* thumbnail_cache_construct (GType object_type, ThumbnailCacheSize size, gulong max_cached_bytes, GdkInterpType interp, JpegQuality quality) { ThumbnailCache * self = NULL; - ThumbnailCacheSize _tmp0_ = 0; - gint _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - ThumbnailCacheSize _tmp5_ = 0; - gulong _tmp6_ = 0UL; - GdkInterpType _tmp7_ = 0; - JpegQuality _tmp8_ = 0; + ThumbnailCacheSize _tmp0_; + gint _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GFile* _tmp4_; + ThumbnailCacheSize _tmp5_; + gulong _tmp6_; + GdkInterpType _tmp7_; + JpegQuality _tmp8_; #line 190 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = (ThumbnailCache*) g_object_new (object_type, NULL); #line 192 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1102,11 +1102,11 @@ static void _thumbnail_cache_report_cycle_one_shot_callback (gpointer self) { void thumbnail_cache_init (void) { - OneShotScheduler* _tmp0_ = NULL; - guint _tmp1_ = 0U; - Workers* _tmp2_ = NULL; - ThumbnailCache* _tmp3_ = NULL; - ThumbnailCache* _tmp4_ = NULL; + OneShotScheduler* _tmp0_; + guint _tmp1_; + Workers* _tmp2_; + ThumbnailCache* _tmp3_; + ThumbnailCache* _tmp4_; #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = one_shot_scheduler_new ("ThumbnailCache cycle reporter", _thumbnail_cache_report_cycle_one_shot_callback, NULL); #line 201 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1142,15 +1142,15 @@ void thumbnail_cache_terminate (void) { void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force, GError** error) { - ThumbnailSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - ThumbnailCache* _tmp3_ = NULL; - ThumbnailSource* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - ThumbnailCache* _tmp6_ = NULL; - ThumbnailSource* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + ThumbnailSource* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + ThumbnailCache* _tmp3_; + ThumbnailSource* _tmp4_; + gboolean _tmp5_; + ThumbnailCache* _tmp6_; + ThumbnailSource* _tmp7_; + gboolean _tmp8_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); @@ -1200,18 +1200,18 @@ void thumbnail_cache_import_from_source (ThumbnailSource* source, gboolean force void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error) { - ThumbnailCache* _tmp0_ = NULL; - ThumbnailSource* _tmp1_ = NULL; - Thumbnails* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - ThumbnailCache* _tmp6_ = NULL; - ThumbnailSource* _tmp7_ = NULL; - Thumbnails* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + ThumbnailCache* _tmp0_; + ThumbnailSource* _tmp1_; + Thumbnails* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; + gboolean _tmp5_; + ThumbnailCache* _tmp6_; + ThumbnailSource* _tmp7_; + Thumbnails* _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; + gboolean _tmp11_; GError * _inner_error_ = NULL; #line 218 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); @@ -1269,12 +1269,12 @@ void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thu void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* dest_source) { - ThumbnailCache* _tmp0_ = NULL; - ThumbnailSource* _tmp1_ = NULL; - ThumbnailSource* _tmp2_ = NULL; - ThumbnailCache* _tmp3_ = NULL; - ThumbnailSource* _tmp4_ = NULL; - ThumbnailSource* _tmp5_ = NULL; + ThumbnailCache* _tmp0_; + ThumbnailSource* _tmp1_; + ThumbnailSource* _tmp2_; + ThumbnailCache* _tmp3_; + ThumbnailSource* _tmp4_; + ThumbnailSource* _tmp5_; #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (src_source)); #line 224 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1300,10 +1300,10 @@ void thumbnail_cache_duplicate (ThumbnailSource* src_source, ThumbnailSource* de void thumbnail_cache_remove (ThumbnailSource* source) { - ThumbnailCache* _tmp0_ = NULL; - ThumbnailSource* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailSource* _tmp3_ = NULL; + ThumbnailCache* _tmp0_; + ThumbnailSource* _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailSource* _tmp3_; #line 229 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 230 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1332,9 +1332,9 @@ static gpointer _g_object_ref0 (gpointer self) { static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) { ThumbnailCache* result = NULL; ThumbnailCacheSize size = 0; - gint _tmp0_ = 0; - ThumbnailCacheSize _tmp1_ = 0; - ThumbnailCacheSize _tmp2_ = 0; + gint _tmp0_; + ThumbnailCacheSize _tmp1_; + ThumbnailCacheSize _tmp2_; #line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = scale; #line 235 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1346,8 +1346,8 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) { #line 236 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp2_ == THUMBNAIL_CACHE_SIZE_BIG) { #line 1349 "ThumbnailCache.c" - ThumbnailCache* _tmp3_ = NULL; - ThumbnailCache* _tmp4_ = NULL; + ThumbnailCache* _tmp3_; + ThumbnailCache* _tmp4_; #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp3_ = thumbnail_cache_big; #line 237 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1358,9 +1358,9 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) { return result; #line 1360 "ThumbnailCache.c" } else { - ThumbnailCacheSize _tmp5_ = 0; - ThumbnailCache* _tmp6_ = NULL; - ThumbnailCache* _tmp7_ = NULL; + ThumbnailCacheSize _tmp5_; + ThumbnailCache* _tmp6_; + ThumbnailCache* _tmp7_; #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = size; #line 239 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1380,7 +1380,7 @@ static ThumbnailCache* thumbnail_cache_get_best_cache (gint scale) { static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { ThumbnailCache* result = NULL; - ThumbnailCacheSize _tmp0_ = 0; + ThumbnailCacheSize _tmp0_; #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = size; #line 246 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1389,8 +1389,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { case THUMBNAIL_CACHE_SIZE_BIG: #line 1391 "ThumbnailCache.c" { - ThumbnailCache* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; + ThumbnailCache* _tmp1_; + ThumbnailCache* _tmp2_; #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = thumbnail_cache_big; #line 248 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1405,8 +1405,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { case THUMBNAIL_CACHE_SIZE_MEDIUM: #line 1407 "ThumbnailCache.c" { - ThumbnailCache* _tmp3_ = NULL; - ThumbnailCache* _tmp4_ = NULL; + ThumbnailCache* _tmp3_; + ThumbnailCache* _tmp4_; #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp3_ = thumbnail_cache_medium; #line 251 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1419,8 +1419,8 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { } default: { - ThumbnailCacheSize _tmp5_ = 0; - gint _tmp6_ = 0; + ThumbnailCacheSize _tmp5_; + gint _tmp6_; #line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = size; #line 254 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1436,13 +1436,13 @@ static ThumbnailCache* thumbnail_cache_get_cache_for (ThumbnailCacheSize size) { GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** error) { GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_ = 0; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailCache* _tmp3_ = NULL; - ThumbnailSource* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; - GdkPixbuf* _tmp7_ = NULL; + gint _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailCache* _tmp3_; + ThumbnailSource* _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; + GdkPixbuf* _tmp7_; GError * _inner_error_ = NULL; #line 258 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), NULL); @@ -1485,16 +1485,16 @@ GdkPixbuf* thumbnail_cache_fetch (ThumbnailSource* source, gint scale, GError** void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { - gint _tmp0_ = 0; - ThumbnailCache* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailSource* _tmp3_ = NULL; - ThumbnailSource* _tmp4_ = NULL; - PhotoFileFormat _tmp5_ = 0; + gint _tmp0_; + ThumbnailCache* _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailSource* _tmp3_; + ThumbnailSource* _tmp4_; + PhotoFileFormat _tmp5_; Dimensions _tmp6_ = {0}; - ThumbnailCacheAsyncFetchCallback _tmp7_ = NULL; - void* _tmp7__target = NULL; - GCancellable* _tmp8_ = NULL; + ThumbnailCacheAsyncFetchCallback _tmp7_; + void* _tmp7__target; + GCancellable* _tmp8_; #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 262 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1528,17 +1528,17 @@ void thumbnail_cache_fetch_async (ThumbnailSource* source, gint scale, Thumbnail void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { - gint _tmp0_ = 0; - ThumbnailCache* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailSource* _tmp3_ = NULL; - ThumbnailSource* _tmp4_ = NULL; - PhotoFileFormat _tmp5_ = 0; - Dimensions _tmp6_ = {0}; - GdkInterpType _tmp7_ = 0; - ThumbnailCacheAsyncFetchCallback _tmp8_ = NULL; - void* _tmp8__target = NULL; - GCancellable* _tmp9_ = NULL; + gint _tmp0_; + ThumbnailCache* _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailSource* _tmp3_; + ThumbnailSource* _tmp4_; + PhotoFileFormat _tmp5_; + Dimensions _tmp6_; + GdkInterpType _tmp7_; + ThumbnailCacheAsyncFetchCallback _tmp8_; + void* _tmp8__target; + GCancellable* _tmp9_; #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); #line 268 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1576,11 +1576,11 @@ void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Di void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, GdkPixbuf* replacement, GError** error) { - ThumbnailCacheSize _tmp0_ = 0; - ThumbnailCache* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailSource* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; + ThumbnailCacheSize _tmp0_; + ThumbnailCache* _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailSource* _tmp3_; + GdkPixbuf* _tmp4_; GError * _inner_error_ = NULL; #line 274 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); @@ -1614,9 +1614,9 @@ void thumbnail_cache_replace (ThumbnailSource* source, ThumbnailCacheSize size, gboolean thumbnail_cache_exists (ThumbnailSource* source) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - ThumbnailCache* _tmp1_ = NULL; - ThumbnailSource* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + ThumbnailCache* _tmp1_; + ThumbnailSource* _tmp2_; + gboolean _tmp3_; #line 279 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_SOURCE (source), FALSE); #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1628,9 +1628,9 @@ gboolean thumbnail_cache_exists (ThumbnailSource* source) { #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp3_) { #line 1631 "ThumbnailCache.c" - ThumbnailCache* _tmp4_ = NULL; - ThumbnailSource* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + ThumbnailCache* _tmp4_; + ThumbnailSource* _tmp5_; + gboolean _tmp6_; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp4_ = thumbnail_cache_medium; #line 280 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1654,8 +1654,8 @@ gboolean thumbnail_cache_exists (ThumbnailSource* source) { void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError** error) { - ThumbnailCacheSize* _tmp0_ = NULL; - gint _tmp0__length1 = 0; + ThumbnailCacheSize* _tmp0_; + gint _tmp0__length1; GError * _inner_error_ = NULL; #line 283 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); @@ -1682,15 +1682,15 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError* #line 1683 "ThumbnailCache.c" { GdkPixbuf* thumbnail = NULL; - ThumbnailSource* _tmp1_ = NULL; - ThumbnailCacheSize _tmp2_ = 0; - GdkPixbuf* _tmp3_ = NULL; - Rotation _tmp4_ = 0; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; - ThumbnailSource* _tmp7_ = NULL; - ThumbnailCacheSize _tmp8_ = 0; - GdkPixbuf* _tmp9_ = NULL; + ThumbnailSource* _tmp1_; + ThumbnailCacheSize _tmp2_; + GdkPixbuf* _tmp3_; + Rotation _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; + ThumbnailSource* _tmp7_; + ThumbnailCacheSize _tmp8_; + GdkPixbuf* _tmp9_; #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = source; #line 285 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1747,19 +1747,19 @@ void thumbnail_cache_rotate (ThumbnailSource* source, Rotation rotation, GError* void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error) { ThumbnailCacheSize max_size = 0; Dimensions dim = {0}; - ThumbnailCacheSize _tmp0_ = 0; + ThumbnailCacheSize _tmp0_; Scaling _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; + Dimensions _tmp2_; Dimensions _tmp3_ = {0}; GdkPixbuf* largest_thumbnail = NULL; - Orientation _tmp14_ = 0; - GdkPixbuf* _tmp15_ = NULL; - GdkPixbuf* _tmp16_ = NULL; + Orientation _tmp14_; + GdkPixbuf* _tmp15_; + GdkPixbuf* _tmp16_; Dimensions largest_thumb_dimensions = {0}; - GdkPixbuf* _tmp17_ = NULL; + GdkPixbuf* _tmp17_; Dimensions _tmp18_ = {0}; - ThumbnailCacheSize* _tmp19_ = NULL; - gint _tmp19__length1 = 0; + ThumbnailCacheSize* _tmp19_; + gint _tmp19__length1; GError * _inner_error_ = NULL; #line 293 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (thumbnails)); @@ -1784,11 +1784,11 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader #line 1785 "ThumbnailCache.c" { GdkPixbuf* _tmp4_ = NULL; - PhotoFileReader* _tmp5_ = NULL; - Dimensions _tmp6_ = {0}; - Dimensions _tmp7_ = {0}; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; + PhotoFileReader* _tmp5_; + Dimensions _tmp6_; + Dimensions _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = reader; #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1805 "ThumbnailCache.c" - goto __catch236_g_error; + goto __catch237_g_error; } #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp9_ = _tmp4_; @@ -1816,14 +1816,14 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader _g_object_unref0 (_tmp4_); #line 1818 "ThumbnailCache.c" } - goto __finally236; - __catch236_g_error: + goto __finally237; + __catch237_g_error: { GError* err = NULL; GdkPixbuf* _tmp10_ = NULL; - PhotoFileReader* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; + PhotoFileReader* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1839,7 +1839,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); #line 1842 "ThumbnailCache.c" - goto __finally236; + goto __finally237; } #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp13_ = _tmp10_; @@ -1855,7 +1855,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader _g_error_free0 (err); #line 1857 "ThumbnailCache.c" } - __finally236: + __finally237: #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1904,19 +1904,19 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader size = size_collection[size_it]; #line 1906 "ThumbnailCache.c" { - ThumbnailCacheSize _tmp20_ = 0; + ThumbnailCacheSize _tmp20_; Scaling _tmp21_ = {0}; - Dimensions _tmp22_ = {0}; + Dimensions _tmp22_; Dimensions _tmp23_ = {0}; - Thumbnails* _tmp24_ = NULL; - ThumbnailCacheSize _tmp25_ = 0; - GdkPixbuf* _tmp26_ = NULL; - Dimensions _tmp27_ = {0}; - gint _tmp28_ = 0; - Dimensions _tmp29_ = {0}; - gint _tmp30_ = 0; - GdkPixbuf* _tmp31_ = NULL; - GdkPixbuf* _tmp32_ = NULL; + Thumbnails* _tmp24_; + ThumbnailCacheSize _tmp25_; + GdkPixbuf* _tmp26_; + Dimensions _tmp27_; + gint _tmp28_; + Dimensions _tmp29_; + gint _tmp30_; + GdkPixbuf* _tmp31_; + GdkPixbuf* _tmp32_; #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp20_ = size; #line 311 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1960,8 +1960,8 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf* preview_frame) { - ThumbnailCacheSize* _tmp0_ = NULL; - gint _tmp0__length1 = 0; + ThumbnailCacheSize* _tmp0_; + gint _tmp0__length1; #line 316 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAILS (thumbnails)); #line 316 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -1989,14 +1989,14 @@ void thumbnail_cache_generate_for_video_frame (Thumbnails* thumbnails, GdkPixbuf #line 1990 "ThumbnailCache.c" { Scaling current_scaling = {0}; - ThumbnailCacheSize _tmp1_ = 0; + ThumbnailCacheSize _tmp1_; Scaling _tmp2_ = {0}; GdkPixbuf* current_thumbnail = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - Thumbnails* _tmp5_ = NULL; - ThumbnailCacheSize _tmp6_ = 0; - GdkPixbuf* _tmp7_ = NULL; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; + Thumbnails* _tmp5_; + ThumbnailCacheSize _tmp6_; + GdkPixbuf* _tmp7_; #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp1_ = size; #line 318 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2037,26 +2037,26 @@ static void thumbnail_cache_report_cycle (void) { static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* source, GError** error) { GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; - ThumbnailSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; + ThumbnailSource* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_ = NULL; - ThumbnailSource* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - ThumbnailSource* _tmp10_ = NULL; - PhotoFileFormat _tmp11_ = 0; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - GdkPixbuf* _tmp14_ = NULL; - gint _tmp15_ = 0; - ThumbnailSource* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - GdkPixbuf* _tmp19_ = NULL; + ThumbnailSource* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + ThumbnailSource* _tmp10_; + PhotoFileFormat _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; + gint _tmp15_; + ThumbnailSource* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GdkPixbuf* _tmp19_; GError * _inner_error_ = NULL; #line 371 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); @@ -2152,24 +2152,24 @@ static GdkPixbuf* _thumbnail_cache_fetch (ThumbnailCache* self, ThumbnailSource* static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* source, PhotoFileFormat format, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { gchar* thumbnail_name = NULL; - ThumbnailSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + ThumbnailSource* _tmp0_; + gchar* _tmp1_; GdkPixbuf* pixbuf = NULL; - const gchar* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; + const gchar* _tmp2_; + GdkPixbuf* _tmp3_; gboolean _tmp4_ = FALSE; - GdkPixbuf* _tmp5_ = NULL; - Workers* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - ThumbnailSource* _tmp19_ = NULL; - GdkPixbuf* _tmp20_ = NULL; - Dimensions _tmp21_ = {0}; - GdkInterpType _tmp22_ = 0; - ThumbnailCacheAsyncFetchCallback _tmp23_ = NULL; - void* _tmp23__target = NULL; - GCancellable* _tmp24_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp25_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp26_ = NULL; + GdkPixbuf* _tmp5_; + Workers* _tmp17_; + const gchar* _tmp18_; + ThumbnailSource* _tmp19_; + GdkPixbuf* _tmp20_; + Dimensions _tmp21_; + GdkInterpType _tmp22_; + ThumbnailCacheAsyncFetchCallback _tmp23_; + void* _tmp23__target; + GCancellable* _tmp24_; + ThumbnailCacheAsyncFetchJob* _tmp25_; + ThumbnailCacheAsyncFetchJob* _tmp26_; #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 388 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2196,7 +2196,7 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* if (_tmp5_ != NULL) { #line 2198 "ThumbnailCache.c" gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp7_ = dimensions_has_area (dim); #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2205,10 +2205,10 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* _tmp6_ = TRUE; #line 2207 "ThumbnailCache.c" } else { - GdkPixbuf* _tmp8_ = NULL; + GdkPixbuf* _tmp8_; Dimensions _tmp9_ = {0}; - Dimensions _tmp10_ = {0}; - gboolean _tmp11_ = FALSE; + Dimensions _tmp10_; + gboolean _tmp11_; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp8_ = pixbuf; #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2232,12 +2232,12 @@ static void _thumbnail_cache_fetch_async (ThumbnailCache* self, ThumbnailSource* #line 393 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp4_) { #line 2235 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchCallback _tmp12_ = NULL; - void* _tmp12__target = NULL; - GdkPixbuf* _tmp13_ = NULL; - GdkPixbuf* _tmp14_ = NULL; - Dimensions _tmp15_ = {0}; - GdkInterpType _tmp16_ = 0; + ThumbnailCacheAsyncFetchCallback _tmp12_; + void* _tmp12__target; + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; + Dimensions _tmp15_; + GdkInterpType _tmp16_; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp12_ = callback; #line 396 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2310,26 +2310,26 @@ static gpointer _g_error_copy0 (gpointer self) { static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* background_job) { ThumbnailCacheAsyncFetchJob* job = NULL; - BackgroundJob* _tmp0_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp1_ = NULL; + BackgroundJob* _tmp0_; + ThumbnailCacheAsyncFetchJob* _tmp1_; gboolean _tmp2_ = FALSE; - ThumbnailCacheAsyncFetchJob* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - ThumbnailCacheAsyncFetchJob* _tmp17_ = NULL; - GdkPixbuf* _tmp18_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp29_ = NULL; - ThumbnailCacheAsyncFetchCallback _tmp30_ = NULL; - void* _tmp30__target = NULL; - ThumbnailCacheAsyncFetchJob* _tmp31_ = NULL; - GdkPixbuf* _tmp32_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp33_ = NULL; - GdkPixbuf* _tmp34_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp35_ = NULL; - Dimensions _tmp36_ = {0}; - ThumbnailCacheAsyncFetchJob* _tmp37_ = NULL; - GdkInterpType _tmp38_ = 0; - ThumbnailCacheAsyncFetchJob* _tmp39_ = NULL; - GError* _tmp40_ = NULL; + ThumbnailCacheAsyncFetchJob* _tmp3_; + gboolean _tmp4_; + ThumbnailCacheAsyncFetchJob* _tmp17_; + GdkPixbuf* _tmp18_; + ThumbnailCacheAsyncFetchJob* _tmp29_; + ThumbnailCacheAsyncFetchCallback _tmp30_; + void* _tmp30__target; + ThumbnailCacheAsyncFetchJob* _tmp31_; + GdkPixbuf* _tmp32_; + ThumbnailCacheAsyncFetchJob* _tmp33_; + GdkPixbuf* _tmp34_; + ThumbnailCacheAsyncFetchJob* _tmp35_; + Dimensions _tmp36_; + ThumbnailCacheAsyncFetchJob* _tmp37_; + GdkInterpType _tmp38_; + ThumbnailCacheAsyncFetchJob* _tmp39_; + GError* _tmp40_; GError * _inner_error_ = NULL; #line 416 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_BACKGROUND_JOB (background_job)); @@ -2346,8 +2346,8 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp4_) { #line 2349 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; + ThumbnailCacheAsyncFetchJob* _tmp5_; + GdkPixbuf* _tmp6_; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = job; #line 421 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2364,13 +2364,13 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back if (_tmp2_) { #line 2366 "ThumbnailCache.c" { - ThumbnailCacheAsyncFetchJob* _tmp7_ = NULL; - ThumbnailSource* _tmp8_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp9_ = NULL; - ThumbnailCache* _tmp10_ = NULL; - ThumbnailCacheSize _tmp11_ = 0; - ThumbnailCacheAsyncFetchJob* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; + ThumbnailCacheAsyncFetchJob* _tmp7_; + ThumbnailSource* _tmp8_; + ThumbnailCacheAsyncFetchJob* _tmp9_; + ThumbnailCache* _tmp10_; + ThumbnailCacheSize _tmp11_; + ThumbnailCacheAsyncFetchJob* _tmp12_; + GdkPixbuf* _tmp13_; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp7_ = job; #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2390,16 +2390,16 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2393 "ThumbnailCache.c" - goto __catch237_g_error; + goto __catch238_g_error; } } - goto __finally237; - __catch237_g_error: + goto __finally238; + __catch238_g_error: { GError* err = NULL; - ThumbnailCacheAsyncFetchJob* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - GError* _tmp16_ = NULL; + ThumbnailCacheAsyncFetchJob* _tmp14_; + GError* _tmp15_; + GError* _tmp16_; #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back _g_error_free0 (err); #line 2420 "ThumbnailCache.c" } - __finally237: + __finally238: #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2439,8 +2439,8 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back #line 429 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp18_ != NULL) { #line 2442 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + ThumbnailCacheAsyncFetchJob* _tmp19_; + gboolean _tmp20_; #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp19_ = job; #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2448,13 +2448,13 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back #line 430 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp20_) { #line 2451 "ThumbnailCache.c" - ThumbnailCacheAsyncFetchJob* _tmp21_ = NULL; - ThumbnailCache* _tmp22_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - ThumbnailCacheAsyncFetchJob* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; + ThumbnailCacheAsyncFetchJob* _tmp21_; + ThumbnailCache* _tmp22_; + ThumbnailCacheAsyncFetchJob* _tmp23_; + const gchar* _tmp24_; + ThumbnailCacheAsyncFetchJob* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp21_ = job; #line 432 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2477,7 +2477,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back thumbnail_cache_schedule_debug (); #line 2479 "ThumbnailCache.c" } else { - gint _tmp28_ = 0; + gint _tmp28_; #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp28_ = thumbnail_cache_cycle_async_resized_thumbnails; #line 437 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2523,20 +2523,20 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back static void _thumbnail_cache_import_from_source (ThumbnailCache* self, ThumbnailSource* source, gboolean force, GError** error) { GFile* file = NULL; - ThumbnailSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + ThumbnailSource* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; LibraryPhoto* photo = NULL; - ThumbnailSource* _tmp6_ = NULL; - LibraryPhoto* _tmp7_ = NULL; + ThumbnailSource* _tmp6_; + LibraryPhoto* _tmp7_; GdkPixbuf* _tmp8_ = NULL; - LibraryPhoto* _tmp9_ = NULL; - ThumbnailCacheSize _tmp10_ = 0; - gint _tmp11_ = 0; + LibraryPhoto* _tmp9_; + ThumbnailCacheSize _tmp10_; + gint _tmp11_; Scaling _tmp12_ = {0}; - GdkPixbuf* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - ThumbnailSource* _tmp15_ = NULL; + GdkPixbuf* _tmp13_; + GFile* _tmp14_; + ThumbnailSource* _tmp15_; GError * _inner_error_ = NULL; #line 445 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2553,8 +2553,8 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail #line 451 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!_tmp2_) { #line 2556 "ThumbnailCache.c" - ThumbnailSource* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + ThumbnailSource* _tmp3_; + gboolean _tmp4_; #line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp3_ = source; #line 452 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2568,7 +2568,7 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail #line 2569 "ThumbnailCache.c" } } else { - ThumbnailSource* _tmp5_ = NULL; + ThumbnailSource* _tmp5_; #line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = source; #line 456 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2636,18 +2636,18 @@ static void _thumbnail_cache_import_from_source (ThumbnailCache* self, Thumbnail static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* scaled, gboolean force, GError** error) { - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; Dimensions _tmp2_ = {0}; - ThumbnailCacheSize _tmp3_ = 0; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - ThumbnailSource* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - ThumbnailSource* _tmp14_ = NULL; + ThumbnailCacheSize _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + ThumbnailSource* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GdkPixbuf* _tmp13_; + ThumbnailSource* _tmp14_; GError * _inner_error_ = NULL; #line 466 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2676,8 +2676,8 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo #line 473 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!_tmp6_) { #line 2679 "ThumbnailCache.c" - ThumbnailSource* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + ThumbnailSource* _tmp7_; + gboolean _tmp8_; #line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp7_ = source; #line 474 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2689,7 +2689,7 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo #line 2690 "ThumbnailCache.c" } } else { - ThumbnailSource* _tmp9_ = NULL; + ThumbnailSource* _tmp9_; #line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp9_ = source; #line 478 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2723,16 +2723,16 @@ static void _thumbnail_cache_import_thumbnail (ThumbnailCache* self, ThumbnailSo static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* src_source, ThumbnailSource* dest_source) { GFile* src_file = NULL; - ThumbnailSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + ThumbnailSource* _tmp0_; + GFile* _tmp1_; GFile* dest_file = NULL; - ThumbnailSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - ThumbnailSource* _tmp5_ = NULL; - PhotoFileFormat _tmp6_ = 0; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + ThumbnailSource* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + ThumbnailSource* _tmp5_; + PhotoFileFormat _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; GError * _inner_error_ = NULL; #line 488 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2771,17 +2771,17 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2774 "ThumbnailCache.c" - goto __catch238_g_error; + goto __catch239_g_error; } } - goto __finally238; - __catch238_g_error: + goto __finally239; + __catch239_g_error: { GError* err = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + GError* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s _g_error_free0 (err); #line 2804 "ThumbnailCache.c" } - __finally238: + __finally239: #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2827,21 +2827,21 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* source, GdkPixbuf* original, GError** error) { GFile* file = NULL; - ThumbnailSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - ThumbnailSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + ThumbnailSource* _tmp0_; + GFile* _tmp1_; + ThumbnailSource* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; GdkPixbuf* scaled = NULL; - GdkPixbuf* _tmp5_ = NULL; - ThumbnailCacheSize _tmp6_ = 0; - gint _tmp7_ = 0; - GdkInterpType _tmp8_ = 0; - GdkPixbuf* _tmp9_ = NULL; - ThumbnailSource* _tmp10_ = NULL; - ThumbnailSource* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + GdkPixbuf* _tmp5_; + ThumbnailCacheSize _tmp6_; + gint _tmp7_; + GdkInterpType _tmp8_; + GdkPixbuf* _tmp9_; + ThumbnailSource* _tmp10_; + ThumbnailSource* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; GError * _inner_error_ = NULL; #line 502 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2913,11 +2913,11 @@ static void _thumbnail_cache_replace (ThumbnailCache* self, ThumbnailSource* sou static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* source) { GFile* file = NULL; - ThumbnailSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - ThumbnailSource* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + ThumbnailSource* _tmp0_; + GFile* _tmp1_; + ThumbnailSource* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; GError * _inner_error_ = NULL; #line 521 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -2946,11 +2946,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2949 "ThumbnailCache.c" - goto __catch239_g_error; + goto __catch240_g_error; } } - goto __finally239; - __catch239_g_error: + goto __finally240; + __catch240_g_error: { GError* err = NULL; #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2961,7 +2961,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour _g_error_free0 (err); #line 2963 "ThumbnailCache.c" } - __finally239: + __finally240: #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -2982,11 +2982,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource* source) { gboolean result = FALSE; - ThumbnailSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + ThumbnailSource* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE); #line 535 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3014,18 +3014,18 @@ static gboolean _thumbnail_cache_exists (ThumbnailCache* self, ThumbnailSource* static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat format, GError** error) { GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - const gchar* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PhotoFileReader* _tmp8_ = NULL; - PhotoFileReader* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; + PhotoFileFormat _tmp1_; + const gchar* _tmp2_; + PhotoFileFormat _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + PhotoFileReader* _tmp8_; + PhotoFileReader* _tmp9_; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; GError * _inner_error_ = NULL; #line 540 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); @@ -3085,13 +3085,13 @@ static GdkPixbuf* thumbnail_cache_read_pixbuf (ThumbnailCache* self, const gchar static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, ThumbnailSource* source) { GFile* result = NULL; - ThumbnailSource* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - ThumbnailSource* _tmp3_ = NULL; - PhotoFileFormat _tmp4_ = 0; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + ThumbnailSource* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + ThumbnailSource* _tmp3_; + PhotoFileFormat _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 545 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3122,13 +3122,13 @@ static GFile* thumbnail_cache_get_source_cached_file (ThumbnailCache* self, Thum static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar* thumbnail_name, PhotoFileFormat thumbnail_format) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + GFile* _tmp0_; + PhotoFileFormat _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 550 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3160,12 +3160,12 @@ static GFile* thumbnail_cache_get_cached_file (ThumbnailCache* self, const gchar static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) { GdkPixbuf* result = NULL; ThumbnailCacheImageData* data = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; GdkPixbuf* _tmp3_ = NULL; - ThumbnailCacheImageData* _tmp4_ = NULL; - GdkPixbuf* _tmp7_ = NULL; + ThumbnailCacheImageData* _tmp4_; + GdkPixbuf* _tmp7_; #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), NULL); #line 554 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3183,8 +3183,8 @@ static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp4_ != NULL) { #line 3186 "ThumbnailCache.c" - ThumbnailCacheImageData* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; + ThumbnailCacheImageData* _tmp5_; + GdkPixbuf* _tmp6_; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp5_ = data; #line 557 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3210,21 +3210,21 @@ static GdkPixbuf* thumbnail_cache_fetch_from_memory (ThumbnailCache* self, const static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* thumbnail_name, GdkPixbuf* thumbnail) { - gulong _tmp0_ = 0UL; - const gchar* _tmp1_ = NULL; + gulong _tmp0_; + const gchar* _tmp1_; ThumbnailCacheImageData* data = NULL; - GdkPixbuf* _tmp2_ = NULL; - ThumbnailCacheImageData* _tmp3_ = NULL; - ThumbnailCacheImageData* _tmp4_ = NULL; - gulong _tmp5_ = 0UL; - GeeHashMap* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - ThumbnailCacheImageData* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gulong _tmp12_ = 0UL; - ThumbnailCacheImageData* _tmp13_ = NULL; - gulong _tmp14_ = 0UL; + GdkPixbuf* _tmp2_; + ThumbnailCacheImageData* _tmp3_; + ThumbnailCacheImageData* _tmp4_; + gulong _tmp5_; + GeeHashMap* _tmp7_; + const gchar* _tmp8_; + ThumbnailCacheImageData* _tmp9_; + GeeArrayList* _tmp10_; + const gchar* _tmp11_; + gulong _tmp12_; + ThumbnailCacheImageData* _tmp13_; + gulong _tmp14_; #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); #line 560 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3256,7 +3256,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* #line 569 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp5_ > ((gulong) THUMBNAIL_CACHE_MAX_INMEMORY_DATA_SIZE)) { #line 3259 "ThumbnailCache.c" - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; #line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp6_ = thumbnail_name; #line 570 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3293,38 +3293,38 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" while (TRUE) { #line 3295 "ThumbnailCache.c" - gulong _tmp15_ = 0UL; - gulong _tmp16_ = 0UL; - GeeArrayList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + gulong _tmp15_; + gulong _tmp16_; + GeeArrayList* _tmp17_; + gint _tmp18_; + gint _tmp19_; gint index = 0; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gint _tmp22_ = 0; + GeeArrayList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gchar* victim_name = NULL; - GeeArrayList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gpointer _tmp25_ = NULL; - GeeArrayList* _tmp26_ = NULL; - gint _tmp27_ = 0; - gpointer _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - GeeHashMap* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - gpointer _tmp32_ = NULL; - gint _tmp33_ = 0; + GeeArrayList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; + GeeArrayList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + gchar* _tmp29_; + GeeHashMap* _tmp30_; + const gchar* _tmp31_; + gpointer _tmp32_; + gint _tmp33_; gboolean removed = FALSE; - GeeHashMap* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; - gboolean _tmp37_ = FALSE; - ThumbnailCacheImageData* _tmp38_ = NULL; - gulong _tmp39_ = 0UL; - gulong _tmp40_ = 0UL; - gulong _tmp41_ = 0UL; - ThumbnailCacheImageData* _tmp42_ = NULL; - gulong _tmp43_ = 0UL; + GeeHashMap* _tmp34_; + const gchar* _tmp35_; + gboolean _tmp36_; + gboolean _tmp37_; + ThumbnailCacheImageData* _tmp38_; + gulong _tmp39_; + gulong _tmp40_; + gulong _tmp41_; + ThumbnailCacheImageData* _tmp42_; + gulong _tmp43_; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp15_ = self->priv->cached_bytes; #line 581 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3426,25 +3426,25 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar* static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const gchar* thumbnail_name) { gboolean result = FALSE; ThumbnailCacheImageData* data = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - ThumbnailCacheImageData* _tmp3_ = NULL; - gulong _tmp4_ = 0UL; - ThumbnailCacheImageData* _tmp5_ = NULL; - gulong _tmp6_ = 0UL; - gulong _tmp7_ = 0UL; - ThumbnailCacheImageData* _tmp8_ = NULL; - gulong _tmp9_ = 0UL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; + ThumbnailCacheImageData* _tmp3_; + gulong _tmp4_; + ThumbnailCacheImageData* _tmp5_; + gulong _tmp6_; + gulong _tmp7_; + ThumbnailCacheImageData* _tmp8_; + gulong _tmp9_; gboolean removed = FALSE; - GeeHashMap* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - GeeArrayList* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; + GeeHashMap* _tmp10_; + const gchar* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; + GeeArrayList* _tmp14_; + const gchar* _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (self), FALSE); #line 601 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3521,16 +3521,14 @@ static gboolean thumbnail_cache_remove_from_memory (ThumbnailCache* self, const static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, GdkPixbuf* pixbuf, ThumbnailSource* source, GError** error) { PhotoFileWriter* _tmp0_ = NULL; - ThumbnailSource* _tmp1_ = NULL; - PhotoFileFormat _tmp2_ = 0; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PhotoFileWriter* _tmp6_ = NULL; - PhotoFileWriter* _tmp7_ = NULL; - PhotoFileWriter* _tmp8_ = NULL; - PhotoFileWriter* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; + ThumbnailSource* _tmp1_; + PhotoFileFormat _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + PhotoFileWriter* _tmp6_; + PhotoFileWriter* _tmp7_; + GdkPixbuf* _tmp8_; GError * _inner_error_ = NULL; #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (IS_THUMBNAIL_CACHE (self)); @@ -3564,20 +3562,12 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G g_propagate_error (error, _inner_error_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3567 "ThumbnailCache.c" +#line 3565 "ThumbnailCache.c" } #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp8_ = _tmp0_; + _tmp8_ = pixbuf; #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = NULL; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp9_ = _tmp8_; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp10_ = pixbuf; -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - photo_file_writer_write (_tmp9_, _tmp10_, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_); -#line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _photo_file_adapter_unref0 (_tmp9_); + photo_file_writer_write (_tmp0_, _tmp8_, THUMBNAIL_CACHE_DEFAULT_QUALITY, &_inner_error_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3586,22 +3576,22 @@ static void thumbnail_cache_save_thumbnail (ThumbnailCache* self, GFile* file, G _photo_file_adapter_unref0 (_tmp0_); #line 621 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 3589 "ThumbnailCache.c" +#line 3579 "ThumbnailCache.c" } #line 620 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _photo_file_adapter_unref0 (_tmp0_); -#line 3593 "ThumbnailCache.c" +#line 3583 "ThumbnailCache.c" } static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType object_type, GdkPixbuf* pixbuf) { ThumbnailCacheImageData* self = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - gint _tmp3_ = 0; - GdkPixbuf* _tmp4_ = NULL; - gint _tmp5_ = 0; + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; + gint _tmp3_; + GdkPixbuf* _tmp4_; + gint _tmp5_; #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3626,21 +3616,21 @@ static ThumbnailCacheImageData* thumbnail_cache_image_data_construct (GType obje self->bytes = ((gulong) _tmp3_) * ((gulong) _tmp5_); #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 3629 "ThumbnailCache.c" +#line 3619 "ThumbnailCache.c" } static ThumbnailCacheImageData* thumbnail_cache_image_data_new (GdkPixbuf* pixbuf) { #line 63 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnail_cache_image_data_construct (THUMBNAIL_CACHE_TYPE_IMAGE_DATA, pixbuf); -#line 3636 "ThumbnailCache.c" +#line 3626 "ThumbnailCache.c" } static void thumbnail_cache_value_image_data_init (GValue* value) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3643 "ThumbnailCache.c" +#line 3633 "ThumbnailCache.c" } @@ -3649,7 +3639,7 @@ static void thumbnail_cache_value_image_data_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_unref (value->data[0].v_pointer); -#line 3652 "ThumbnailCache.c" +#line 3642 "ThumbnailCache.c" } } @@ -3659,11 +3649,11 @@ static void thumbnail_cache_value_image_data_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = thumbnail_cache_image_data_ref (src_value->data[0].v_pointer); -#line 3662 "ThumbnailCache.c" +#line 3652 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" dest_value->data[0].v_pointer = NULL; -#line 3666 "ThumbnailCache.c" +#line 3656 "ThumbnailCache.c" } } @@ -3671,66 +3661,66 @@ static void thumbnail_cache_value_image_data_copy_value (const GValue* src_value static gpointer thumbnail_cache_value_image_data_peek_pointer (const GValue* value) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 3674 "ThumbnailCache.c" +#line 3664 "ThumbnailCache.c" } static gchar* thumbnail_cache_value_image_data_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (collect_values[0].v_pointer) { -#line 3681 "ThumbnailCache.c" - ThumbnailCacheImageData* object; +#line 3671 "ThumbnailCache.c" + ThumbnailCacheImageData * object; object = collect_values[0].v_pointer; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (object->parent_instance.g_class == NULL) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3688 "ThumbnailCache.c" +#line 3678 "ThumbnailCache.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3692 "ThumbnailCache.c" +#line 3682 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = thumbnail_cache_image_data_ref (object); -#line 3696 "ThumbnailCache.c" +#line 3686 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3700 "ThumbnailCache.c" +#line 3690 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 3704 "ThumbnailCache.c" +#line 3694 "ThumbnailCache.c" } static gchar* thumbnail_cache_value_image_data_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - ThumbnailCacheImageData** object_p; + ThumbnailCacheImageData ** object_p; object_p = collect_values[0].v_pointer; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!object_p) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3715 "ThumbnailCache.c" +#line 3705 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (!value->data[0].v_pointer) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = NULL; -#line 3721 "ThumbnailCache.c" +#line 3711 "ThumbnailCache.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = value->data[0].v_pointer; -#line 3725 "ThumbnailCache.c" +#line 3715 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" *object_p = thumbnail_cache_image_data_ref (value->data[0].v_pointer); -#line 3729 "ThumbnailCache.c" +#line 3719 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return NULL; -#line 3733 "ThumbnailCache.c" +#line 3723 "ThumbnailCache.c" } @@ -3744,7 +3734,7 @@ static GParamSpec* thumbnail_cache_param_spec_image_data (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return G_PARAM_SPEC (spec); -#line 3747 "ThumbnailCache.c" +#line 3737 "ThumbnailCache.c" } @@ -3753,12 +3743,12 @@ static gpointer thumbnail_cache_value_get_image_data (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA), NULL); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return value->data[0].v_pointer; -#line 3756 "ThumbnailCache.c" +#line 3746 "ThumbnailCache.c" } static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_object) { - ThumbnailCacheImageData* old; + ThumbnailCacheImageData * old; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA)); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3773,23 +3763,23 @@ static void thumbnail_cache_value_set_image_data (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_ref (value->data[0].v_pointer); -#line 3776 "ThumbnailCache.c" +#line 3766 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3780 "ThumbnailCache.c" +#line 3770 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (old) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_unref (old); -#line 3786 "ThumbnailCache.c" +#line 3776 "ThumbnailCache.c" } } static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_object) { - ThumbnailCacheImageData* old; + ThumbnailCacheImageData * old; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, THUMBNAIL_CACHE_TYPE_IMAGE_DATA)); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3802,17 +3792,17 @@ static void thumbnail_cache_value_take_image_data (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = v_object; -#line 3805 "ThumbnailCache.c" +#line 3795 "ThumbnailCache.c" } else { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" value->data[0].v_pointer = NULL; -#line 3809 "ThumbnailCache.c" +#line 3799 "ThumbnailCache.c" } #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (old) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_image_data_unref (old); -#line 3815 "ThumbnailCache.c" +#line 3805 "ThumbnailCache.c" } } @@ -3822,21 +3812,21 @@ static void thumbnail_cache_image_data_class_init (ThumbnailCacheImageDataClass thumbnail_cache_image_data_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" ((ThumbnailCacheImageDataClass *) klass)->finalize = thumbnail_cache_image_data_finalize; -#line 3825 "ThumbnailCache.c" +#line 3815 "ThumbnailCache.c" } static void thumbnail_cache_image_data_instance_init (ThumbnailCacheImageData * self) { #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->ref_count = 1; -#line 3832 "ThumbnailCache.c" +#line 3822 "ThumbnailCache.c" } -static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj) { +static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData * obj) { ThumbnailCacheImageData * self; - gulong _tmp0_ = 0UL; - gulong _tmp1_ = 0UL; + gulong _tmp0_; + gulong _tmp1_; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, ThumbnailCacheImageData); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3851,7 +3841,7 @@ static void thumbnail_cache_image_data_finalize (ThumbnailCacheImageData* obj) { thumbnail_cache_schedule_debug (); #line 60 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (self->pixbuf); -#line 3854 "ThumbnailCache.c" +#line 3844 "ThumbnailCache.c" } @@ -3870,18 +3860,18 @@ static GType thumbnail_cache_image_data_get_type (void) { static gpointer thumbnail_cache_image_data_ref (gpointer instance) { - ThumbnailCacheImageData* self; + ThumbnailCacheImageData * self; self = instance; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_atomic_int_inc (&self->ref_count); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return instance; -#line 3879 "ThumbnailCache.c" +#line 3869 "ThumbnailCache.c" } static void thumbnail_cache_image_data_unref (gpointer instance) { - ThumbnailCacheImageData* self; + ThumbnailCacheImageData * self; self = instance; #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3889,7 +3879,7 @@ static void thumbnail_cache_image_data_unref (gpointer instance) { THUMBNAIL_CACHE_IMAGE_DATA_GET_CLASS (self)->finalize (self); #line 59 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3892 "ThumbnailCache.c" +#line 3882 "ThumbnailCache.c" } } @@ -3897,28 +3887,28 @@ static void thumbnail_cache_image_data_unref (gpointer instance) { static void _thumbnail_cache_async_fetch_completion_callback_completion_callback (BackgroundJob* job, gpointer self) { #line 94 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_async_fetch_completion_callback (job); -#line 3900 "ThumbnailCache.c" +#line 3890 "ThumbnailCache.c" } static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (GType object_type, ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { ThumbnailCacheAsyncFetchJob* self = NULL; - ThumbnailCache* _tmp0_ = NULL; - GCancellable* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - ThumbnailCache* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - ThumbnailSource* _tmp6_ = NULL; - ThumbnailSource* _tmp7_ = NULL; - ThumbnailSource* _tmp8_ = NULL; - PhotoFileFormat _tmp9_ = 0; - GdkPixbuf* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - Dimensions _tmp12_ = {0}; - GdkInterpType _tmp13_ = 0; - ThumbnailCacheAsyncFetchCallback _tmp14_ = NULL; - void* _tmp14__target = NULL; + ThumbnailCache* _tmp0_; + GCancellable* _tmp1_; + ThumbnailCache* _tmp2_; + ThumbnailCache* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + ThumbnailSource* _tmp6_; + ThumbnailSource* _tmp7_; + ThumbnailSource* _tmp8_; + PhotoFileFormat _tmp9_; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; + Dimensions _tmp12_; + GdkInterpType _tmp13_; + ThumbnailCacheAsyncFetchCallback _tmp14_; + void* _tmp14__target; #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_val_if_fail (IS_THUMBNAIL_CACHE (cache), NULL); #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -3993,21 +3983,21 @@ static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_construct (G self->callback_target = _tmp14__target; #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return self; -#line 3996 "ThumbnailCache.c" +#line 3986 "ThumbnailCache.c" } static ThumbnailCacheAsyncFetchJob* thumbnail_cache_async_fetch_job_new (ThumbnailCache* cache, const gchar* thumbnail_name, ThumbnailSource* source, GdkPixbuf* prefetched, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable) { #line 91 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return thumbnail_cache_async_fetch_job_construct (THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, cache, thumbnail_name, source, prefetched, dim, interp, callback, callback_target, cancellable); -#line 4003 "ThumbnailCache.c" +#line 3993 "ThumbnailCache.c" } static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priority (BackgroundJob* base) { ThumbnailCacheAsyncFetchJob * self; BackgroundJobJobPriority result = 0; - GdkInterpType _tmp0_ = 0; + GdkInterpType _tmp0_; #line 106 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob); #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4018,26 +4008,26 @@ static BackgroundJobJobPriority thumbnail_cache_async_fetch_job_real_get_priorit case GDK_INTERP_NEAREST: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_TILES: -#line 4021 "ThumbnailCache.c" +#line 4011 "ThumbnailCache.c" { #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = BACKGROUND_JOB_JOB_PRIORITY_HIGH; #line 112 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 4027 "ThumbnailCache.c" +#line 4017 "ThumbnailCache.c" } default: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_BILINEAR: #line 109 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" case GDK_INTERP_HYPER: -#line 4034 "ThumbnailCache.c" +#line 4024 "ThumbnailCache.c" { #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" result = BACKGROUND_JOB_JOB_PRIORITY_NORMAL; #line 117 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return result; -#line 4040 "ThumbnailCache.c" +#line 4030 "ThumbnailCache.c" } } } @@ -4048,24 +4038,24 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { GError * _inner_error_ = NULL; #line 121 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob); -#line 4051 "ThumbnailCache.c" +#line 4041 "ThumbnailCache.c" { - GdkPixbuf* _tmp0_ = NULL; - gboolean _tmp7_ = FALSE; + GdkPixbuf* _tmp0_; + gboolean _tmp7_; GdkPixbuf* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GdkPixbuf* _tmp16_ = NULL; + gboolean _tmp9_; + GdkPixbuf* _tmp16_; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp0_ = self->unscaled; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp0_ == NULL) { -#line 4062 "ThumbnailCache.c" +#line 4052 "ThumbnailCache.c" GdkPixbuf* _tmp1_ = NULL; - ThumbnailCache* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - PhotoFileFormat _tmp4_ = 0; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; + ThumbnailCache* _tmp2_; + const gchar* _tmp3_; + PhotoFileFormat _tmp4_; + GdkPixbuf* _tmp5_; + GdkPixbuf* _tmp6_; #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp2_ = self->cache; #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4078,8 +4068,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _tmp1_ = _tmp5_; #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4081 "ThumbnailCache.c" - goto __catch240_g_error; +#line 4071 "ThumbnailCache.c" + goto __catch241_g_error; } #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp6_ = _tmp1_; @@ -4093,7 +4083,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { self->fetched = TRUE; #line 124 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp1_); -#line 4096 "ThumbnailCache.c" +#line 4086 "ThumbnailCache.c" } #line 129 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp7_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob)); @@ -4101,17 +4091,17 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { if (_tmp7_) { #line 130 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4104 "ThumbnailCache.c" +#line 4094 "ThumbnailCache.c" } #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp9_ = dimensions_has_area (&self->dim); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp9_) { -#line 4110 "ThumbnailCache.c" - GdkPixbuf* _tmp10_ = NULL; - Dimensions _tmp11_ = {0}; - GdkInterpType _tmp12_ = 0; - GdkPixbuf* _tmp13_ = NULL; +#line 4100 "ThumbnailCache.c" + GdkPixbuf* _tmp10_; + Dimensions _tmp11_; + GdkInterpType _tmp12_; + GdkPixbuf* _tmp13_; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp10_ = self->unscaled; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4124,10 +4114,10 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _g_object_unref0 (_tmp8_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp8_ = _tmp13_; -#line 4127 "ThumbnailCache.c" +#line 4117 "ThumbnailCache.c" } else { - GdkPixbuf* _tmp14_ = NULL; - GdkPixbuf* _tmp15_ = NULL; + GdkPixbuf* _tmp14_; + GdkPixbuf* _tmp15_; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp14_ = self->unscaled; #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4136,7 +4126,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _g_object_unref0 (_tmp8_); #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp8_ = _tmp15_; -#line 4139 "ThumbnailCache.c" +#line 4129 "ThumbnailCache.c" } #line 133 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp16_ = _g_object_ref0 (_tmp8_); @@ -4146,13 +4136,13 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { self->scaled = _tmp16_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp8_); -#line 4149 "ThumbnailCache.c" +#line 4139 "ThumbnailCache.c" } - goto __finally240; - __catch240_g_error: + goto __finally241; + __catch241_g_error: { GError* err = NULL; - GError* _tmp17_ = NULL; + GError* _tmp17_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" err = _inner_error_; #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4161,22 +4151,22 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _tmp17_ = err; #line 135 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp17_->domain == G_FILE_ERROR) { -#line 4164 "ThumbnailCache.c" +#line 4154 "ThumbnailCache.c" { #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_async_fetch_job_generate_thumbnail (self, &_inner_error_); #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4170 "ThumbnailCache.c" - goto __catch241_g_error; +#line 4160 "ThumbnailCache.c" + goto __catch242_g_error; } } - goto __finally241; - __catch241_g_error: + goto __finally242; + __catch242_g_error: { GError* generr = NULL; - GError* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + GError* _tmp18_; + GError* _tmp19_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" generr = _inner_error_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4191,9 +4181,9 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { err = _tmp19_; #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (generr); -#line 4194 "ThumbnailCache.c" +#line 4184 "ThumbnailCache.c" } - __finally241: + __finally242: #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4206,11 +4196,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4209 "ThumbnailCache.c" +#line 4199 "ThumbnailCache.c" } } else { - GError* _tmp20_ = NULL; - GError* _tmp21_ = NULL; + GError* _tmp20_; + GError* _tmp21_; #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp20_ = err; #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4219,13 +4209,13 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { _g_error_free0 (self->err); #line 144 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->err = _tmp21_; -#line 4222 "ThumbnailCache.c" +#line 4212 "ThumbnailCache.c" } #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_error_free0 (err); -#line 4226 "ThumbnailCache.c" +#line 4216 "ThumbnailCache.c" } - __finally240: + __finally241: #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4234,17 +4224,17 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4237 "ThumbnailCache.c" +#line 4227 "ThumbnailCache.c" } } static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAsyncFetchJob* self, GError** error) { Photo* photo = NULL; - ThumbnailSource* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; - GdkPixbuf* _tmp19_ = NULL; + ThumbnailSource* _tmp0_; + Photo* _tmp1_; + Photo* _tmp2_; + GdkPixbuf* _tmp19_; GError * _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" g_return_if_fail (THUMBNAIL_CACHE_IS_ASYNC_FETCH_JOB (self)); @@ -4258,14 +4248,14 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _tmp2_ = photo; #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp2_ != NULL) { -#line 4261 "ThumbnailCache.c" +#line 4251 "ThumbnailCache.c" GdkPixbuf* _tmp3_ = NULL; - Photo* _tmp4_ = NULL; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; + Photo* _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; Scaling _tmp7_ = {0}; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp4_ = photo; #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4286,7 +4276,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _g_object_unref0 (photo); #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4289 "ThumbnailCache.c" +#line 4279 "ThumbnailCache.c" } #line 152 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp9_ = _tmp3_; @@ -4298,12 +4288,12 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->unscaled = _tmp9_; #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp3_); -#line 4301 "ThumbnailCache.c" +#line 4291 "ThumbnailCache.c" } else { Video* video = NULL; - ThumbnailSource* _tmp10_ = NULL; - Video* _tmp11_ = NULL; - Video* _tmp12_ = NULL; + ThumbnailSource* _tmp10_; + Video* _tmp11_; + Video* _tmp12_; #line 154 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp10_ = self->source; #line 154 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4314,13 +4304,13 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _tmp12_ = video; #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp12_ != NULL) { -#line 4317 "ThumbnailCache.c" +#line 4307 "ThumbnailCache.c" GdkPixbuf* _tmp13_ = NULL; - Video* _tmp14_ = NULL; - Dimensions _tmp15_ = {0}; - gint _tmp16_ = 0; - GdkPixbuf* _tmp17_ = NULL; - GdkPixbuf* _tmp18_ = NULL; + Video* _tmp14_; + Dimensions _tmp15_; + gint _tmp16_; + GdkPixbuf* _tmp17_; + GdkPixbuf* _tmp18_; #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp14_ = video; #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4341,7 +4331,7 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs _g_object_unref0 (photo); #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" return; -#line 4344 "ThumbnailCache.c" +#line 4334 "ThumbnailCache.c" } #line 156 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp18_ = _tmp13_; @@ -4353,21 +4343,21 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->unscaled = _tmp18_; #line 155 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (_tmp13_); -#line 4356 "ThumbnailCache.c" +#line 4346 "ThumbnailCache.c" } #line 151 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (video); -#line 4360 "ThumbnailCache.c" +#line 4350 "ThumbnailCache.c" } #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp19_ = self->unscaled; #line 159 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" if (_tmp19_ != NULL) { -#line 4366 "ThumbnailCache.c" - GdkPixbuf* _tmp20_ = NULL; - Dimensions _tmp21_ = {0}; - GdkInterpType _tmp22_ = 0; - GdkPixbuf* _tmp23_ = NULL; +#line 4356 "ThumbnailCache.c" + GdkPixbuf* _tmp20_; + Dimensions _tmp21_; + GdkInterpType _tmp22_; + GdkPixbuf* _tmp23_; #line 160 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _tmp20_ = self->unscaled; #line 160 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4382,11 +4372,11 @@ static void thumbnail_cache_async_fetch_job_generate_thumbnail (ThumbnailCacheAs self->scaled = _tmp23_; #line 161 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->replace = TRUE; -#line 4385 "ThumbnailCache.c" +#line 4375 "ThumbnailCache.c" } #line 149 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" _g_object_unref0 (photo); -#line 4389 "ThumbnailCache.c" +#line 4379 "ThumbnailCache.c" } @@ -4396,10 +4386,10 @@ 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 = (BackgroundJobJobPriority (*)(BackgroundJob*)) 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 = (void (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_execute; -#line 4402 "ThumbnailCache.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_cache_async_fetch_job_real_execute; +#line 4392 "ThumbnailCache.c" } @@ -4412,11 +4402,11 @@ static void thumbnail_cache_async_fetch_job_instance_init (ThumbnailCacheAsyncFe self->fetched = FALSE; #line 89 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->replace = FALSE; -#line 4415 "ThumbnailCache.c" +#line 4405 "ThumbnailCache.c" } -static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj) { +static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob * obj) { ThumbnailCacheAsyncFetchJob * self; #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, THUMBNAIL_CACHE_TYPE_ASYNC_FETCH_JOB, ThumbnailCacheAsyncFetchJob); @@ -4434,7 +4424,7 @@ static void thumbnail_cache_async_fetch_job_finalize (BackgroundJob* obj) { _g_error_free0 (self->err); #line 77 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" BACKGROUND_JOB_CLASS (thumbnail_cache_async_fetch_job_parent_class)->finalize (obj); -#line 4437 "ThumbnailCache.c" +#line 4427 "ThumbnailCache.c" } @@ -4451,7 +4441,7 @@ static GType thumbnail_cache_async_fetch_job_get_type (void) { static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) { - ThumbnailCacheSize* _tmp0_ = NULL; + ThumbnailCacheSize* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" @@ -4468,13 +4458,13 @@ static void thumbnail_cache_class_init (ThumbnailCacheClass * klass) { thumbnail_cache_ALL_SIZES = _tmp0_; #line 54 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" thumbnail_cache_ALL_SIZES_length1 = 2; -#line 4471 "ThumbnailCache.c" +#line 4461 "ThumbnailCache.c" } static void thumbnail_cache_instance_init (ThumbnailCache * self) { - GeeHashMap* _tmp0_ = NULL; - GeeArrayList* _tmp1_ = NULL; + GeeHashMap* _tmp0_; + GeeArrayList* _tmp1_; #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" @@ -4487,11 +4477,11 @@ static void thumbnail_cache_instance_init (ThumbnailCache * self) { self->priv->cache_lru = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->cached_bytes = (gulong) 0; -#line 4490 "ThumbnailCache.c" +#line 4480 "ThumbnailCache.c" } -static void thumbnail_cache_finalize (GObject* obj) { +static void thumbnail_cache_finalize (GObject * obj) { ThumbnailCache * self; #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_CACHE, ThumbnailCache); @@ -4503,7 +4493,7 @@ static void thumbnail_cache_finalize (GObject* obj) { _g_object_unref0 (self->priv->cache_lru); #line 27 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" G_OBJECT_CLASS (thumbnail_cache_parent_class)->finalize (obj); -#line 4506 "ThumbnailCache.c" +#line 4496 "ThumbnailCache.c" } -- cgit v1.2.3