Merge branch 'feature/upstream' into develop

1 files changed, 1024 insertions, 996 deletions

diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index cf238a0..c4d3563 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.36.6, the Vala compiler
+/* PixbufCache.c generated by valac 0.40.4, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gee.h>
@@ -136,6 +137,11 @@ typedef struct _BackgroundJobClass BackgroundJobClass;
 
 typedef struct _PixbufCacheFetchJob PixbufCacheFetchJob;
 typedef struct _PixbufCacheFetchJobClass PixbufCacheFetchJobClass;
+enum  {
+	PIXBUF_CACHE_0_PROPERTY,
+	PIXBUF_CACHE_NUM_PROPERTIES
+};
+static GParamSpec* pixbuf_cache_properties[PIXBUF_CACHE_NUM_PROPERTIES];
 
 #define TYPE_ALTERATION (alteration_get_type ())
 #define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration))
@@ -197,6 +203,11 @@ typedef struct _PixbufCachePixbufCacheBatchClass PixbufCachePixbufCacheBatchClas
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 typedef struct _PixbufCachePixbufCacheBatchPrivate PixbufCachePixbufCacheBatchPrivate;
+enum  {
+	PIXBUF_CACHE_PIXBUF_CACHE_BATCH_0_PROPERTY,
+	PIXBUF_CACHE_PIXBUF_CACHE_BATCH_NUM_PROPERTIES
+};
+static GParamSpec* pixbuf_cache_pixbuf_cache_batch_properties[PIXBUF_CACHE_PIXBUF_CACHE_BATCH_NUM_PROPERTIES];
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_ABSTRACT_SEMAPHORE (abstract_semaphore_get_type ())
@@ -223,9 +234,9 @@ typedef struct _PixbufCacheBaselineFetchJobPrivate PixbufCacheBaselineFetchJobPr
 typedef struct _PixbufCacheMasterFetchJobPrivate PixbufCacheMasterFetchJobPrivate;
 enum  {
 	PIXBUF_CACHE_FETCHED_SIGNAL,
-	PIXBUF_CACHE_LAST_SIGNAL
+	PIXBUF_CACHE_NUM_SIGNALS
 };
-static guint pixbuf_cache_signals[PIXBUF_CACHE_LAST_SIGNAL] = {0};
+static guint pixbuf_cache_signals[PIXBUF_CACHE_NUM_SIGNALS] = {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; }
@@ -354,9 +365,15 @@ static gpointer pixbuf_cache_master_fetch_job_parent_class = NULL;
 GType pixbuf_cache_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
@@ -376,120 +393,228 @@ GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 gpointer background_job_ref (gpointer instance);
 void background_job_unref (gpointer instance);
-GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_background_job (GValue* value, gpointer v_object);
-void value_take_background_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_background_job (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_background_job (GValue* value,
+                               gpointer v_object);
+void value_take_background_job (GValue* value,
+                                gpointer v_object);
 gpointer value_get_background_job (const GValue* value);
 GType background_job_get_type (void) G_GNUC_CONST;
 static GType pixbuf_cache_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PIXBUF_CACHE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXBUF_CACHE, PixbufCachePrivate))
-enum  {
-	PIXBUF_CACHE_DUMMY_PROPERTY
-};
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
-static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map);
-static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* removed);
-static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self);
+static void pixbuf_cache_on_sources_altered (PixbufCache* self,
+                                      GeeMap* map);
+static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                     GeeMap* items,
+                                                                     gpointer self);
+static void pixbuf_cache_on_sources_removed (PixbufCache* self,
+                                      GeeIterable* removed);
+static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender,
+                                                                     GeeIterable* removed,
+                                                                     gpointer self);
 void background_job_cancel (BackgroundJob* self);
 gpointer workers_ref (gpointer instance);
 void workers_unref (gpointer instance);
-GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_workers (GValue* value, gpointer v_object);
-void value_take_workers (GValue* value, gpointer v_object);
+GParamSpec* param_spec_workers (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags);
+void value_set_workers (GValue* value,
+                        gpointer v_object);
+void value_take_workers (GValue* value,
+                         gpointer v_object);
 gpointer value_get_workers (const GValue* value);
 GType workers_get_type (void) G_GNUC_CONST;
-PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
-PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
+PixbufCache* pixbuf_cache_new (SourceCollection* sources,
+                               PixbufCachePhotoType type,
+                               Scaling* scaling,
+                               gint max_count,
+                               PixbufCacheCacheFilter filter,
+                               void* filter_target);
+PixbufCache* pixbuf_cache_construct (GType object_type,
+                                     SourceCollection* sources,
+                                     PixbufCachePhotoType type,
+                                     Scaling* scaling,
+                                     gint max_count,
+                                     PixbufCacheCacheFilter filter,
+                                     void* filter_target);
 guint workers_thread_per_cpu_minus_one (void);
-Workers* workers_new (guint max_threads, gboolean exclusive);
-Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive);
-void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result);
-GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo);
-static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo);
-GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error);
+Workers* workers_new (guint max_threads,
+                      gboolean exclusive);
+Workers* workers_construct (GType object_type,
+                            guint max_threads,
+                            gboolean exclusive);
+void pixbuf_cache_get_scaling (PixbufCache* self,
+                               Scaling* result);
+GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self,
+                                          Photo* photo);
+static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self,
+                                    Photo* photo);
+GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self,
+                               Photo* photo,
+                               GError** error);
 GFile* photo_get_actual_file (Photo* self);
-static void pixbuf_cache_decache (PixbufCache* self, Photo* photo);
+static void pixbuf_cache_decache (PixbufCache* self,
+                           Photo* photo);
 void background_job_wait_for_completion (BackgroundJob* self);
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
-static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf);
-void pixbuf_cache_drop (PixbufCache* self, Photo* photo);
-gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo);
-void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force);
-static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo);
-static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j);
-static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self);
-static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target);
-static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target);
+GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self,
+                                    Scaling* scaling,
+                                    GError** error);
+static void pixbuf_cache_encache (PixbufCache* self,
+                           Photo* photo,
+                           GdkPixbuf* pixbuf);
+void pixbuf_cache_drop (PixbufCache* self,
+                        Photo* photo);
+gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self,
+                                       Photo* photo);
+void pixbuf_cache_prefetch (PixbufCache* self,
+                            Photo* photo,
+                            BackgroundJobJobPriority priority,
+                            gboolean force);
+static void pixbuf_cache_prioritize (PixbufCache* self,
+                              Photo* photo);
+static void pixbuf_cache_on_fetched (PixbufCache* self,
+                              BackgroundJob* j);
+static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job,
+                                                   gpointer self);
+static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner,
+                                                                  BackgroundJobJobPriority priority,
+                                                                  Photo* photo,
+                                                                  Scaling* scaling,
+                                                                  CompletionCallback callback,
+                                                                  void* callback_target);
+static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (GType object_type,
+                                                                        PixbufCache* owner,
+                                                                        BackgroundJobJobPriority priority,
+                                                                        Photo* photo,
+                                                                        Scaling* scaling,
+                                                                        CompletionCallback callback,
+                                                                        void* callback_target);
 static GType pixbuf_cache_baseline_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target);
-static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target);
+static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner,
+                                                              BackgroundJobJobPriority priority,
+                                                              Photo* photo,
+                                                              Scaling* scaling,
+                                                              CompletionCallback callback,
+                                                              void* callback_target);
+static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType object_type,
+                                                                    PixbufCache* owner,
+                                                                    BackgroundJobJobPriority priority,
+                                                                    Photo* photo,
+                                                                    Scaling* scaling,
+                                                                    CompletionCallback callback,
+                                                                    void* callback_target);
 static GType pixbuf_cache_master_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-void workers_enqueue (Workers* self, BackgroundJob* job);
-void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force);
+void workers_enqueue (Workers* self,
+                      BackgroundJob* job);
+void pixbuf_cache_prefetch_many (PixbufCache* self,
+                                 GeeCollection* photos,
+                                 BackgroundJobJobPriority priority,
+                                 gboolean force);
 GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST;
-void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force);
+void pixbuf_cache_prefetch_batch (PixbufCache* self,
+                                  PixbufCachePixbufCacheBatch* batch,
+                                  gboolean force);
 void pixbuf_cache_cancel_all (PixbufCache* self);
 gchar* data_object_to_string (DataObject* self);
-gboolean alteration_has_subject (Alteration* self, const gchar* subject);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum  {
-	PIXBUF_CACHE_PIXBUF_CACHE_BATCH_DUMMY_PROPERTY
-};
+gboolean alteration_has_subject (Alteration* self,
+                                 const gchar* subject);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure,
+                                                          GValue * return_value,
+                                                          guint n_param_values,
+                                                          const GValue * param_values,
+                                                          gpointer invocation_hint,
+                                                          gpointer marshal_data);
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void);
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type);
-gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b);
-enum  {
-	PIXBUF_CACHE_FETCH_JOB_DUMMY_PROPERTY
-};
-static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type, PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target);
+gint background_job_job_priority_compare_func (BackgroundJobJobPriority a,
+                                               BackgroundJobJobPriority b);
+static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type,
+                                                       PixbufCache* owner,
+                                                       BackgroundJobJobPriority priority,
+                                                       Photo* photo,
+                                                       Scaling* scaling,
+                                                       CompletionCallback callback,
+                                                       void* callback_target);
 Semaphore* semaphore_new (void);
 Semaphore* semaphore_construct (GType object_type);
 gpointer abstract_semaphore_ref (gpointer instance);
 void abstract_semaphore_unref (gpointer instance);
-GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_abstract_semaphore (GValue* value, gpointer v_object);
-void value_take_abstract_semaphore (GValue* value, gpointer v_object);
+GParamSpec* param_spec_abstract_semaphore (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_abstract_semaphore (GValue* value,
+                                   gpointer v_object);
+void value_take_abstract_semaphore (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_abstract_semaphore (const GValue* value);
 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);
+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);
-enum  {
-	PIXBUF_CACHE_BASELINE_FETCH_JOB_DUMMY_PROPERTY
-};
 static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base);
-enum  {
-	PIXBUF_CACHE_MASTER_FETCH_JOB_DUMMY_PROPERTY
-};
 static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base);
-GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error);
+GdkPixbuf* photo_get_master_pixbuf (Photo* self,
+                                    Scaling* scaling,
+                                    gboolean rotate,
+                                    GError** error);
 static void pixbuf_cache_finalize (GObject * obj);
 
 
-static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+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 482 "PixbufCache.c"
+#line 601 "PixbufCache.c"
 }
 
 
-static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
+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 489 "PixbufCache.c"
+#line 612 "PixbufCache.c"
 }
 
 
-GType pixbuf_cache_photo_type_get_type (void) {
+GType
+pixbuf_cache_photo_type_get_type (void)
+{
 	static volatile gsize pixbuf_cache_photo_type_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_photo_type_type_id__volatile)) {
 		static const GEnumValue values[] = {{PIXBUF_CACHE_PHOTO_TYPE_BASELINE, "PIXBUF_CACHE_PHOTO_TYPE_BASELINE", "baseline"}, {PIXBUF_CACHE_PHOTO_TYPE_MASTER, "PIXBUF_CACHE_PHOTO_TYPE_MASTER", "master"}, {0, NULL, NULL}};
@@ -501,26 +626,28 @@ GType pixbuf_cache_photo_type_get_type (void) {
 }
 
 
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 508 "PixbufCache.c"
+#line 635 "PixbufCache.c"
 }
 
 
-PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) {
+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_;
-	SourceCollection* _tmp1_;
-	PixbufCachePhotoType _tmp2_;
-	Scaling _tmp3_;
-	gint _tmp4_;
-	PixbufCacheCacheFilter _tmp5_;
-	void* _tmp5__target;
-	gint _tmp6_;
-	Workers* _tmp7_;
-	PixbufCachePhotoType _tmp10_;
-	SourceCollection* _tmp12_;
+	Scaling _tmp1_;
+	Workers* _tmp2_;
 #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"
@@ -528,84 +655,71 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = (PixbufCache*) g_object_new (object_type, NULL);
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = sources;
-#line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = _data_collection_ref0 (_tmp0_);
+	_tmp0_ = _data_collection_ref0 (sources);
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_data_collection_unref0 (self->priv->sources);
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->sources = _tmp1_;
+	self->priv->sources = _tmp0_;
 #line 88 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = type;
-#line 88 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->type = _tmp2_;
+	self->priv->type = type;
 #line 89 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = *scaling;
+	_tmp1_ = *scaling;
 #line 89 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->scaling = _tmp3_;
-#line 90 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = max_count;
+	self->priv->scaling = _tmp1_;
 #line 90 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->max_count = _tmp4_;
+	self->priv->max_count = max_count;
 #line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5_ = filter;
+	self->priv->filter = filter;
 #line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5__target = filter_target;
-#line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->filter = _tmp5_;
-#line 91 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priv->filter_target = _tmp5__target;
-#line 93 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = max_count;
+	self->priv->filter_target = filter_target;
 #line 93 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_vala_assert (_tmp6_ > 0, "max_count > 0");
+	_vala_assert (max_count > 0, "max_count > 0");
 #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp7_ = pixbuf_cache_background_workers;
+	_tmp2_ = pixbuf_cache_background_workers;
 #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp7_ == NULL) {
-#line 567 "PixbufCache.c"
-		guint _tmp8_;
-		Workers* _tmp9_;
+	if (_tmp2_ == NULL) {
+#line 682 "PixbufCache.c"
+		Workers* _tmp3_;
 #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"
-		_tmp9_ = workers_new (_tmp8_, FALSE);
+		_tmp3_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_workers_unref0 (pixbuf_cache_background_workers);
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		pixbuf_cache_background_workers = _tmp9_;
-#line 578 "PixbufCache.c"
+		pixbuf_cache_background_workers = _tmp3_;
+#line 690 "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 584 "PixbufCache.c"
-		SourceCollection* _tmp11_;
-#line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp11_ = sources;
+	if (type != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
 #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 590 "PixbufCache.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0);
+#line 696 "PixbufCache.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp12_ = sources;
-#line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, 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 598 "PixbufCache.c"
+#line 702 "PixbufCache.c"
 }
 
 
-PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) {
+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 605 "PixbufCache.c"
+#line 716 "PixbufCache.c"
 }
 
 
-void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) {
+void
+pixbuf_cache_get_scaling (PixbufCache* self,
+                          Scaling* result)
+{
 	Scaling _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
@@ -615,151 +729,141 @@ void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) {
 	*result = _tmp0_;
 #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return;
-#line 619 "PixbufCache.c"
+#line 733 "PixbufCache.c"
 }
 
 
-GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) {
+GdkPixbuf*
+pixbuf_cache_get_ready_pixbuf (PixbufCache* self,
+                               Photo* photo)
+{
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_;
-	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp0_;
 #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"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = photo;
-#line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = pixbuf_cache_get_cached (self, _tmp0_);
+	_tmp0_ = pixbuf_cache_get_cached (self, photo);
 #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 639 "PixbufCache.c"
+#line 753 "PixbufCache.c"
 }
 
 
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 646 "PixbufCache.c"
+#line 762 "PixbufCache.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 653 "PixbufCache.c"
+#line 771 "PixbufCache.c"
 }
 
 
-GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error) {
+GdkPixbuf*
+pixbuf_cache_fetch (PixbufCache* self,
+                    Photo* photo,
+                    GError** error)
+{
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_;
+	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp2_;
 	GdkPixbuf* pixbuf = NULL;
-	Photo* _tmp6_;
-	GdkPixbuf* _tmp7_;
-	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	PixbufCacheFetchJob* job = NULL;
-	GeeHashMap* _tmp9_;
-	Photo* _tmp10_;
-	gpointer _tmp11_;
-	PixbufCacheFetchJob* _tmp12_;
-	GdkPixbuf* _tmp22_ = NULL;
-	Photo* _tmp23_;
-	Scaling _tmp24_;
-	GdkPixbuf* _tmp25_;
-	GdkPixbuf* _tmp26_;
-	Photo* _tmp27_;
-	GdkPixbuf* _tmp28_;
+	GeeHashMap* _tmp5_;
+	gpointer _tmp6_;
+	PixbufCacheFetchJob* _tmp7_;
+	GdkPixbuf* _tmp17_ = NULL;
+	Scaling _tmp18_;
+	GdkPixbuf* _tmp19_;
+	GdkPixbuf* _tmp20_;
+	GdkPixbuf* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PIXBUF_CACHE (self), NULL);
 #line 129 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = photo;
+	_tmp0_ = photo_get_actual_file (photo);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo_get_actual_file (_tmp0_);
+	_tmp1_ = _tmp0_;
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = _tmp1_;
+	_tmp2_ = !g_file_query_exists (_tmp1_, NULL);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = g_file_query_exists (_tmp2_, NULL);
+	_g_object_unref0 (_tmp1_);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = !_tmp3_;
-#line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_g_object_unref0 (_tmp2_);
-#line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp4_) {
-#line 699 "PixbufCache.c"
-		Photo* _tmp5_;
-#line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp5_ = photo;
+	if (_tmp2_) {
 #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		pixbuf_cache_decache (self, _tmp5_);
-#line 705 "PixbufCache.c"
+		pixbuf_cache_decache (self, photo);
+#line 813 "PixbufCache.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = photo;
+	_tmp3_ = pixbuf_cache_get_cached (self, photo);
 #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp7_ = pixbuf_cache_get_cached (self, _tmp6_);
-#line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf = _tmp7_;
+	pixbuf = _tmp3_;
 #line 134 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp8_ = pixbuf;
+	_tmp4_ = pixbuf;
 #line 134 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp8_ != NULL) {
+	if (_tmp4_ != NULL) {
 #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		result = pixbuf;
 #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 721 "PixbufCache.c"
+#line 827 "PixbufCache.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp9_ = self->priv->in_progress;
-#line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp10_ = photo;
+	_tmp5_ = self->priv->in_progress;
 #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_);
+	_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo);
 #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	job = (PixbufCacheFetchJob*) _tmp11_;
+	job = (PixbufCacheFetchJob*) _tmp6_;
 #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp12_ = job;
+	_tmp7_ = job;
 #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp12_ != NULL) {
-#line 735 "PixbufCache.c"
-		PixbufCacheFetchJob* _tmp13_;
+	if (_tmp7_ != NULL) {
+#line 839 "PixbufCache.c"
+		PixbufCacheFetchJob* _tmp8_;
+		PixbufCacheFetchJob* _tmp9_;
+		GError* _tmp10_;
 		PixbufCacheFetchJob* _tmp14_;
-		GError* _tmp15_;
-		PixbufCacheFetchJob* _tmp19_;
-		GdkPixbuf* _tmp20_;
-		GdkPixbuf* _tmp21_;
+		GdkPixbuf* _tmp15_;
+		GdkPixbuf* _tmp16_;
 #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp13_ = job;
+		_tmp8_ = job;
 #line 144 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		background_job_wait_for_completion (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_BACKGROUND_JOB, BackgroundJob));
+		background_job_wait_for_completion (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp14_ = job;
+		_tmp9_ = job;
 #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp15_ = _tmp14_->err;
+		_tmp10_ = _tmp9_->err;
 #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		if (_tmp15_ != NULL) {
-#line 752 "PixbufCache.c"
-			PixbufCacheFetchJob* _tmp16_;
-			GError* _tmp17_;
-			GError* _tmp18_;
+		if (_tmp10_ != NULL) {
+#line 856 "PixbufCache.c"
+			PixbufCacheFetchJob* _tmp11_;
+			GError* _tmp12_;
+			GError* _tmp13_;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp16_ = job;
+			_tmp11_ = job;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp17_ = _tmp16_->err;
+			_tmp12_ = _tmp11_->err;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp18_ = _g_error_copy0 (_tmp17_);
+			_tmp13_ = _g_error_copy0 (_tmp12_);
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_inner_error_ = _tmp18_;
+			_inner_error_ = _tmp13_;
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			g_propagate_error (error, _inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -768,32 +872,30 @@ 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 772 "PixbufCache.c"
+#line 876 "PixbufCache.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp19_ = job;
+		_tmp14_ = job;
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp20_ = _tmp19_->pixbuf;
+		_tmp15_ = _tmp14_->pixbuf;
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp21_ = _g_object_ref0 (_tmp20_);
+		_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		result = _tmp21_;
+		result = _tmp16_;
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_background_job_unref0 (job);
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (pixbuf);
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 788 "PixbufCache.c"
+#line 892 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp23_ = photo;
-#line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp24_ = self->priv->scaling;
+	_tmp18_ = self->priv->scaling;
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp25_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp24_, &_inner_error_);
+	_tmp19_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp18_, &_inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp22_ = _tmp25_;
+	_tmp17_ = _tmp19_;
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -804,472 +906,408 @@ 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 808 "PixbufCache.c"
+#line 910 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp26_ = _tmp22_;
+	_tmp20_ = _tmp17_;
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp22_ = NULL;
+	_tmp17_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_g_object_unref0 (pixbuf);
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf = _tmp26_;
+	pixbuf = _tmp20_;
 #line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp27_ = photo;
+	_tmp21_ = pixbuf;
 #line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp28_ = pixbuf;
-#line 157 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf_cache_encache (self, _tmp27_, _tmp28_);
+	pixbuf_cache_encache (self, photo, _tmp21_);
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	result = pixbuf;
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp17_);
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 832 "PixbufCache.c"
+#line 932 "PixbufCache.c"
 }
 
 
-void pixbuf_cache_drop (PixbufCache* self, Photo* photo) {
-	Photo* _tmp0_;
-	Photo* _tmp1_;
+void
+pixbuf_cache_drop (PixbufCache* self,
+                   Photo* photo)
+{
 #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"
 	g_return_if_fail (IS_PHOTO (photo));
 #line 166 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = photo;
-#line 166 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf_cache_cancel_prefetch (self, _tmp0_);
+	pixbuf_cache_cancel_prefetch (self, photo);
 #line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo;
-#line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf_cache_decache (self, _tmp1_);
-#line 851 "PixbufCache.c"
+	pixbuf_cache_decache (self, photo);
+#line 948 "PixbufCache.c"
 }
 
 
-static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self) {
+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 858 "PixbufCache.c"
+#line 958 "PixbufCache.c"
 }
 
 
-void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force) {
-	Photo* _tmp0_;
+void
+pixbuf_cache_prefetch (PixbufCache* self,
+                       Photo* photo,
+                       BackgroundJobJobPriority priority,
+                       gboolean force)
+{
+	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp2_;
+	gboolean _tmp3_ = FALSE;
+	GeeHashMap* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_;
-	GeeHashMap* _tmp12_;
-	Photo* _tmp13_;
-	gboolean _tmp14_;
-	gboolean _tmp15_ = FALSE;
-	PixbufCacheCacheFilter _tmp16_;
-	void* _tmp16__target;
+	PixbufCacheCacheFilter _tmp7_;
+	void* _tmp7__target;
 	PixbufCacheFetchJob* job = NULL;
-	PixbufCachePhotoType _tmp20_;
-	GeeHashMap* _tmp30_;
-	Photo* _tmp31_;
-	PixbufCacheFetchJob* _tmp32_;
-	Workers* _tmp33_;
-	PixbufCacheFetchJob* _tmp34_;
+	PixbufCachePhotoType _tmp9_;
+	GeeHashMap* _tmp15_;
+	PixbufCacheFetchJob* _tmp16_;
+	Workers* _tmp17_;
+	PixbufCacheFetchJob* _tmp18_;
 #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"
 	g_return_if_fail (IS_PHOTO (photo));
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = photo;
-#line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo_get_actual_file (_tmp0_);
-#line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = photo_get_actual_file (photo);
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = g_file_query_exists (_tmp2_, NULL);
+	_tmp1_ = _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = !_tmp3_;
+	_tmp2_ = !g_file_query_exists (_tmp1_, NULL);
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp4_) {
-#line 901 "PixbufCache.c"
-		Photo* _tmp5_;
+	if (_tmp2_) {
 #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 907 "PixbufCache.c"
+		pixbuf_cache_decache (self, photo);
+#line 998 "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 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"
-		_tmp9_ = photo;
+	if (!force) {
+#line 1002 "PixbufCache.c"
+		GeeHashMap* _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
+		_tmp4_ = self->priv->cache;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = _tmp10_;
-#line 925 "PixbufCache.c"
+		_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo);
+#line 1008 "PixbufCache.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = FALSE;
-#line 929 "PixbufCache.c"
+		_tmp3_ = FALSE;
+#line 1012 "PixbufCache.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp6_) {
-#line 933 "PixbufCache.c"
-		Photo* _tmp11_;
+	if (_tmp3_) {
 #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_);
+		pixbuf_cache_prioritize (self, photo);
 #line 180 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 941 "PixbufCache.c"
+#line 1020 "PixbufCache.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp12_ = self->priv->in_progress;
+	_tmp5_ = self->priv->in_progress;
 #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp13_ = photo;
-#line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp14_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
-#line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp14_) {
+	if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo)) {
 #line 184 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 953 "PixbufCache.c"
+#line 1028 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp16_ = self->priv->filter;
-#line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp16__target = self->priv->filter_target;
+	_tmp7_ = self->priv->filter;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp16_ != NULL) {
-#line 961 "PixbufCache.c"
-		PixbufCacheCacheFilter _tmp17_;
-		void* _tmp17__target;
-		Photo* _tmp18_;
-		gboolean _tmp19_;
+	_tmp7__target = self->priv->filter_target;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp17_ = self->priv->filter;
+	if (_tmp7_ != NULL) {
+#line 1036 "PixbufCache.c"
+		PixbufCacheCacheFilter _tmp8_;
+		void* _tmp8__target;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp17__target = self->priv->filter_target;
+		_tmp8_ = self->priv->filter;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp18_ = photo;
+		_tmp8__target = self->priv->filter_target;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp19_ = _tmp17_ (_tmp18_, _tmp17__target);
-#line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp15_ = !_tmp19_;
-#line 976 "PixbufCache.c"
+		_tmp6_ = !_tmp8_ (photo, _tmp8__target);
+#line 1045 "PixbufCache.c"
 	} else {
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp15_ = FALSE;
-#line 980 "PixbufCache.c"
+		_tmp6_ = FALSE;
+#line 1049 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp15_) {
+	if (_tmp6_) {
 #line 187 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 986 "PixbufCache.c"
+#line 1055 "PixbufCache.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	job = NULL;
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp20_ = self->priv->type;
+	_tmp9_ = self->priv->type;
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	switch (_tmp20_) {
+	switch (_tmp9_) {
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_BASELINE:
-#line 996 "PixbufCache.c"
+#line 1065 "PixbufCache.c"
 		{
-			BackgroundJobJobPriority _tmp21_;
-			Photo* _tmp22_;
-			Scaling _tmp23_;
-			PixbufCacheBaselineFetchJob* _tmp24_;
+			Scaling _tmp10_;
+			PixbufCacheBaselineFetchJob* _tmp11_;
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp21_ = priority;
+			_tmp10_ = self->priv->scaling;
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp22_ = photo;
-#line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp23_ = self->priv->scaling;
-#line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp24_ = pixbuf_cache_baseline_fetch_job_new (self, _tmp21_, _tmp22_, &_tmp23_, _pixbuf_cache_on_fetched_completion_callback, self);
+			_tmp11_ = pixbuf_cache_baseline_fetch_job_new (self, priority, photo, &_tmp10_, _pixbuf_cache_on_fetched_completion_callback, self);
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
+			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 193 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1016 "PixbufCache.c"
+#line 1079 "PixbufCache.c"
 		}
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_MASTER:
-#line 1020 "PixbufCache.c"
+#line 1083 "PixbufCache.c"
 		{
-			BackgroundJobJobPriority _tmp25_;
-			Photo* _tmp26_;
-			Scaling _tmp27_;
-			PixbufCacheMasterFetchJob* _tmp28_;
+			Scaling _tmp12_;
+			PixbufCacheMasterFetchJob* _tmp13_;
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp25_ = priority;
+			_tmp12_ = self->priv->scaling;
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp26_ = photo;
-#line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp27_ = self->priv->scaling;
-#line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp28_ = pixbuf_cache_master_fetch_job_new (self, _tmp25_, _tmp26_, &_tmp27_, _pixbuf_cache_on_fetched_completion_callback, self);
+			_tmp13_ = pixbuf_cache_master_fetch_job_new (self, priority, photo, &_tmp12_, _pixbuf_cache_on_fetched_completion_callback, self);
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
 #line 196 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
+			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 197 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1040 "PixbufCache.c"
+#line 1097 "PixbufCache.c"
 		}
 		default:
 		{
-			PixbufCachePhotoType _tmp29_;
+			PixbufCachePhotoType _tmp14_;
 #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp29_ = self->priv->type;
+			_tmp14_ = self->priv->type;
 #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp29_);
-#line 1049 "PixbufCache.c"
+			g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp14_);
+#line 1106 "PixbufCache.c"
 		}
 	}
 #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp30_ = self->priv->in_progress;
-#line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp31_ = photo;
+	_tmp15_ = self->priv->in_progress;
 #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp32_ = job;
+	_tmp16_ = job;
 #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp31_, _tmp32_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, _tmp16_);
 #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp33_ = pixbuf_cache_background_workers;
+	_tmp17_ = pixbuf_cache_background_workers;
 #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp34_ = job;
+	_tmp18_ = job;
 #line 205 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	workers_enqueue (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_BACKGROUND_JOB, BackgroundJob));
+	workers_enqueue (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1068 "PixbufCache.c"
+#line 1123 "PixbufCache.c"
 }
 
 
-void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, BackgroundJobJobPriority priority, gboolean force) {
+void
+pixbuf_cache_prefetch_many (PixbufCache* self,
+                            GeeCollection* photos,
+                            BackgroundJobJobPriority priority,
+                            gboolean force)
+{
 #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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 1077 "PixbufCache.c"
+#line 1137 "PixbufCache.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp0_;
-		GeeIterator* _tmp1_;
+		GeeIterator* _tmp0_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp0_ = photos;
+		_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable));
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_photo_it = _tmp1_;
+		_photo_it = _tmp0_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1090 "PixbufCache.c"
-			GeeIterator* _tmp2_;
-			gboolean _tmp3_;
+#line 1147 "PixbufCache.c"
+			GeeIterator* _tmp1_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp4_;
-			gpointer _tmp5_;
-			Photo* _tmp6_;
-			BackgroundJobJobPriority _tmp7_;
-			gboolean _tmp8_;
-#line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp2_ = _photo_it;
+			GeeIterator* _tmp2_;
+			gpointer _tmp3_;
+			Photo* _tmp4_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp3_ = gee_iterator_next (_tmp2_);
+			_tmp1_ = _photo_it;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp3_) {
+			if (!gee_iterator_next (_tmp1_)) {
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1107 "PixbufCache.c"
+#line 1159 "PixbufCache.c"
 			}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp4_ = _photo_it;
+			_tmp2_ = _photo_it;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp5_ = gee_iterator_get (_tmp4_);
+			_tmp3_ = gee_iterator_get (_tmp2_);
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			photo = (Photo*) _tmp5_;
+			photo = (Photo*) _tmp3_;
 #line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp6_ = photo;
+			_tmp4_ = photo;
 #line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp7_ = priority;
-#line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp8_ = force;
-#line 213 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			pixbuf_cache_prefetch (self, _tmp6_, _tmp7_, _tmp8_);
+			pixbuf_cache_prefetch (self, _tmp4_, priority, force);
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (photo);
-#line 1125 "PixbufCache.c"
+#line 1173 "PixbufCache.c"
 		}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_photo_it);
-#line 1129 "PixbufCache.c"
+#line 1177 "PixbufCache.c"
 	}
 }
 
 
-void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force) {
+void
+pixbuf_cache_prefetch_batch (PixbufCache* self,
+                             PixbufCachePixbufCacheBatch* batch,
+                             gboolean force)
+{
 #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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 1139 "PixbufCache.c"
+#line 1191 "PixbufCache.c"
 	{
 		GeeIterator* _priority_it = NULL;
-		PixbufCachePixbufCacheBatch* _tmp0_;
+		GeeSet* _tmp0_;
 		GeeSet* _tmp1_;
-		GeeSet* _tmp2_;
+		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-		GeeIterator* _tmp4_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp0_ = batch;
+		_tmp0_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (batch, GEE_TYPE_MULTI_MAP, GeeMultiMap));
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
+		_tmp1_ = _tmp0_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp2_ = _tmp1_;
+		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_priority_it = _tmp4_;
+		_priority_it = _tmp3_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1163 "PixbufCache.c"
-			GeeIterator* _tmp5_;
-			gboolean _tmp6_;
+#line 1212 "PixbufCache.c"
+			GeeIterator* _tmp4_;
 			BackgroundJobJobPriority priority = 0;
-			GeeIterator* _tmp7_;
-			gpointer _tmp8_;
-#line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp5_ = _priority_it;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp6_ = gee_iterator_next (_tmp5_);
+			_tmp4_ = _priority_it;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp6_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1177 "PixbufCache.c"
+#line 1223 "PixbufCache.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp7_ = _priority_it;
+			_tmp5_ = _priority_it;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp8_ = gee_iterator_get (_tmp7_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			priority = (BackgroundJobJobPriority) ((gintptr) _tmp8_);
-#line 1185 "PixbufCache.c"
+			priority = (BackgroundJobJobPriority) ((gintptr) _tmp6_);
+#line 1231 "PixbufCache.c"
 			{
 				GeeIterator* _photo_it = NULL;
-				PixbufCachePixbufCacheBatch* _tmp9_;
-				BackgroundJobJobPriority _tmp10_;
-				GeeCollection* _tmp11_;
-				GeeCollection* _tmp12_;
-				GeeIterator* _tmp13_;
-				GeeIterator* _tmp14_;
-#line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp9_ = batch;
+				BackgroundJobJobPriority _tmp7_;
+				GeeCollection* _tmp8_;
+				GeeCollection* _tmp9_;
+				GeeIterator* _tmp10_;
+				GeeIterator* _tmp11_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp10_ = priority;
+				_tmp7_ = priority;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp11_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp10_));
+				_tmp8_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (batch, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp7_));
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp12_ = _tmp11_;
+				_tmp9_ = _tmp8_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
+				_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp14_ = _tmp13_;
+				_tmp11_ = _tmp10_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_g_object_unref0 (_tmp12_);
+				_g_object_unref0 (_tmp9_);
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_photo_it = _tmp14_;
+				_photo_it = _tmp11_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				while (TRUE) {
-#line 1212 "PixbufCache.c"
-					GeeIterator* _tmp15_;
-					gboolean _tmp16_;
+#line 1255 "PixbufCache.c"
+					GeeIterator* _tmp12_;
 					Photo* photo = NULL;
-					GeeIterator* _tmp17_;
-					gpointer _tmp18_;
-					Photo* _tmp19_;
-					BackgroundJobJobPriority _tmp20_;
-					gboolean _tmp21_;
-#line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp15_ = _photo_it;
+					GeeIterator* _tmp13_;
+					gpointer _tmp14_;
+					Photo* _tmp15_;
+					BackgroundJobJobPriority _tmp16_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp16_ = gee_iterator_next (_tmp15_);
+					_tmp12_ = _photo_it;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					if (!_tmp16_) {
+					if (!gee_iterator_next (_tmp12_)) {
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 						break;
-#line 1229 "PixbufCache.c"
+#line 1268 "PixbufCache.c"
 					}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp17_ = _photo_it;
+					_tmp13_ = _photo_it;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp18_ = gee_iterator_get (_tmp17_);
+					_tmp14_ = gee_iterator_get (_tmp13_);
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					photo = (Photo*) _tmp18_;
-#line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp19_ = photo;
+					photo = (Photo*) _tmp14_;
 #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp20_ = priority;
+					_tmp15_ = photo;
 #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					_tmp21_ = force;
+					_tmp16_ = priority;
 #line 220 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-					pixbuf_cache_prefetch (self, _tmp19_, _tmp20_, _tmp21_);
+					pixbuf_cache_prefetch (self, _tmp15_, _tmp16_, force);
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_g_object_unref0 (photo);
-#line 1247 "PixbufCache.c"
+#line 1284 "PixbufCache.c"
 				}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_g_object_unref0 (_photo_it);
-#line 1251 "PixbufCache.c"
+#line 1288 "PixbufCache.c"
 			}
 		}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_priority_it);
-#line 1256 "PixbufCache.c"
+#line 1293 "PixbufCache.c"
 	}
 }
 
 
-gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
+gboolean
+pixbuf_cache_cancel_prefetch (PixbufCache* self,
+                              Photo* photo)
+{
 	gboolean result = FALSE;
 	PixbufCacheFetchJob* job = NULL;
 	GeeHashMap* _tmp0_;
-	Photo* _tmp1_;
-	gpointer _tmp2_;
-	PixbufCacheFetchJob* _tmp3_;
+	gpointer _tmp1_;
+	PixbufCacheFetchJob* _tmp2_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp4_;
-	Photo* _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-	PixbufCacheFetchJob* _tmp8_;
+	GeeHashMap* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	PixbufCacheFetchJob* _tmp6_;
 #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"
@@ -1277,54 +1315,52 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp0_ = self->priv->in_progress;
 #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo;
-#line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo);
 #line 225 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	job = (PixbufCacheFetchJob*) _tmp2_;
+	job = (PixbufCacheFetchJob*) _tmp1_;
 #line 226 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 226 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		result = FALSE;
 #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_background_job_unref0 (job);
 #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 1296 "PixbufCache.c"
+#line 1332 "PixbufCache.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = self->priv->in_progress;
+	_tmp3_ = self->priv->in_progress;
 #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5_ = photo;
+	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, NULL);
 #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL);
-#line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	removed = _tmp6_;
+	removed = _tmp4_;
 #line 231 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp7_ = removed;
+	_tmp5_ = removed;
 #line 231 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_vala_assert (_tmp7_, "removed");
+	_vala_assert (_tmp5_, "removed");
 #line 233 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp8_ = job;
+	_tmp6_ = job;
 #line 233 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_BACKGROUND_JOB, BackgroundJob));
+	background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	result = TRUE;
 #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
 #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 1320 "PixbufCache.c"
+#line 1354 "PixbufCache.c"
 }
 
 
-void pixbuf_cache_cancel_all (PixbufCache* self) {
-	GeeHashMap* _tmp11_;
+void
+pixbuf_cache_cancel_all (PixbufCache* self)
+{
+	GeeHashMap* _tmp10_;
 #line 242 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
-#line 1328 "PixbufCache.c"
+#line 1364 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -1351,428 +1387,411 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 		_job_it = _tmp5_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1355 "PixbufCache.c"
+#line 1391 "PixbufCache.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			PixbufCacheFetchJob* job = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			PixbufCacheFetchJob* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			PixbufCacheFetchJob* _tmp9_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp6_ = _job_it;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1370 "PixbufCache.c"
+#line 1403 "PixbufCache.c"
 			}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp8_ = _job_it;
+			_tmp7_ = _job_it;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			job = (PixbufCacheFetchJob*) _tmp9_;
+			job = (PixbufCacheFetchJob*) _tmp8_;
 #line 247 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp10_ = job;
+			_tmp9_ = job;
 #line 247 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 1384 "PixbufCache.c"
+#line 1417 "PixbufCache.c"
 		}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 1388 "PixbufCache.c"
+#line 1421 "PixbufCache.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp11_ = self->priv->in_progress;
+	_tmp10_ = 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 1394 "PixbufCache.c"
+	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 1427 "PixbufCache.c"
 }
 
 
-static gpointer _background_job_ref0 (gpointer self) {
+static gpointer
+_background_job_ref0 (gpointer self)
+{
 #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 1401 "PixbufCache.c"
+#line 1436 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
+static void
+pixbuf_cache_on_fetched (PixbufCache* self,
+                         BackgroundJob* j)
+{
 	PixbufCacheFetchJob* job = 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_;
+	PixbufCacheFetchJob* _tmp0_;
+	GeeHashMap* _tmp1_;
+	PixbufCacheFetchJob* _tmp2_;
+	Photo* _tmp3_;
+	PixbufCacheFetchJob* _tmp4_;
+	GError* _tmp5_;
+	PixbufCacheFetchJob* _tmp19_;
+	Photo* _tmp20_;
+	PixbufCacheFetchJob* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	PixbufCacheFetchJob* _tmp23_;
+	Photo* _tmp24_;
+	PixbufCacheFetchJob* _tmp25_;
+	GdkPixbuf* _tmp26_;
 #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"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
 #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = j;
-#line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob));
+	_tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob));
 #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	job = _tmp1_;
+	job = _tmp0_;
 #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = self->priv->in_progress;
+	_tmp1_ = self->priv->in_progress;
 #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = _tmp3_->photo;
+	_tmp3_ = _tmp2_->photo;
 #line 257 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
+	gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL);
 #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5_ = job;
+	_tmp4_ = job;
 #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = _tmp5_->err;
+	_tmp5_ = _tmp4_->err;
 #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp6_ != NULL) {
-#line 1446 "PixbufCache.c"
-		PixbufCacheFetchJob* _tmp7_;
-		GdkPixbuf* _tmp8_;
-		PixbufCacheFetchJob* _tmp9_;
-		Photo* _tmp10_;
+	if (_tmp5_ != NULL) {
+#line 1481 "PixbufCache.c"
+		PixbufCacheFetchJob* _tmp6_;
+		GdkPixbuf* _tmp7_;
+		PixbufCacheFetchJob* _tmp8_;
+		Photo* _tmp9_;
+		gchar* _tmp10_;
 		gchar* _tmp11_;
-		gchar* _tmp12_;
-		PixbufCacheFetchJob* _tmp13_;
-		GError* _tmp14_;
-		const gchar* _tmp15_;
-		PixbufCacheFetchJob* _tmp16_;
-		Photo* _tmp17_;
-		PixbufCacheFetchJob* _tmp18_;
-		GError* _tmp19_;
+		PixbufCacheFetchJob* _tmp12_;
+		GError* _tmp13_;
+		const gchar* _tmp14_;
+		PixbufCacheFetchJob* _tmp15_;
+		Photo* _tmp16_;
+		PixbufCacheFetchJob* _tmp17_;
+		GError* _tmp18_;
 #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp7_ = job;
+		_tmp6_ = job;
 #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp8_ = _tmp7_->pixbuf;
+		_tmp7_ = _tmp6_->pixbuf;
 #line 260 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_vala_assert (_tmp8_ == NULL, "job.pixbuf == null");
+		_vala_assert (_tmp7_ == NULL, "job.pixbuf == null");
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp9_ = job;
+		_tmp8_ = job;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp10_ = _tmp9_->photo;
+		_tmp9_ = _tmp8_->photo;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
+		_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp13_ = job;
+		_tmp12_ = job;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp14_ = _tmp13_->err;
+		_tmp13_ = _tmp12_->err;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp15_ = _tmp14_->message;
+		_tmp14_ = _tmp13_->message;
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		g_critical ("PixbufCache.vala:262: Unable to readahead %s: %s", _tmp12_, _tmp15_);
+		g_critical ("PixbufCache.vala:262: Unable to readahead %s: %s", _tmp11_, _tmp14_);
 #line 262 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_g_free0 (_tmp12_);
+		_g_free0 (_tmp11_);
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp16_ = job;
+		_tmp15_ = job;
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp17_ = _tmp16_->photo;
+		_tmp16_ = _tmp15_->photo;
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp18_ = job;
+		_tmp17_ = job;
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp19_ = _tmp18_->err;
+		_tmp18_ = _tmp17_->err;
 #line 263 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp17_, NULL, _tmp19_);
+		g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp16_, NULL, _tmp18_);
 #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_background_job_unref0 (job);
 #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 1498 "PixbufCache.c"
+#line 1533 "PixbufCache.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp20_ = job;
+	_tmp19_ = job;
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp21_ = _tmp20_->photo;
+	_tmp20_ = _tmp19_->photo;
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp22_ = job;
+	_tmp21_ = job;
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp23_ = _tmp22_->pixbuf;
+	_tmp22_ = _tmp21_->pixbuf;
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf_cache_encache (self, _tmp21_, _tmp23_);
+	pixbuf_cache_encache (self, _tmp20_, _tmp22_);
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp24_ = job;
+	_tmp23_ = job;
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp25_ = _tmp24_->photo;
+	_tmp24_ = _tmp23_->photo;
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp26_ = job;
+	_tmp25_ = job;
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp27_ = _tmp26_->pixbuf;
+	_tmp26_ = _tmp25_->pixbuf;
 #line 275 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp25_, _tmp27_, NULL);
+	g_signal_emit (self, pixbuf_cache_signals[PIXBUF_CACHE_FETCHED_SIGNAL], 0, _tmp24_, _tmp26_, NULL);
 #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1522 "PixbufCache.c"
+#line 1557 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
+static void
+pixbuf_cache_on_sources_altered (PixbufCache* self,
+                                 GeeMap* map)
+{
 #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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 1531 "PixbufCache.c"
+#line 1569 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_;
+		GeeSet* _tmp0_;
 		GeeSet* _tmp1_;
 		GeeSet* _tmp2_;
-		GeeSet* _tmp3_;
+		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-		GeeIterator* _tmp5_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp0_ = map;
+		_tmp0_ = gee_map_get_keys (map);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_map_get_keys (_tmp0_);
+		_tmp1_ = _tmp0_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp2_ = _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp3_ = _tmp2_;
-#line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_g_object_unref0 (_tmp3_);
+		_g_object_unref0 (_tmp2_);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_object_it = _tmp5_;
+		_object_it = _tmp4_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1558 "PixbufCache.c"
-			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
+#line 1593 "PixbufCache.c"
+			GeeIterator* _tmp5_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			DataObject* _tmp8_;
 			gpointer _tmp9_;
-			GeeMap* _tmp10_;
-			DataObject* _tmp11_;
-			gpointer _tmp12_;
-			Alteration* _tmp13_;
-			gboolean _tmp14_;
-			gboolean _tmp15_;
+			Alteration* _tmp10_;
+			gboolean _tmp11_;
 			Photo* photo = 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;
+			DataObject* _tmp12_;
+			Photo* _tmp13_;
+			GeeHashMap* _tmp14_;
+			Photo* _tmp15_;
+			Photo* _tmp24_;
+			Photo* _tmp25_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
+			_tmp5_ = _object_it;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp5_)) {
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1586 "PixbufCache.c"
+#line 1615 "PixbufCache.c"
 			}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp8_ = _object_it;
+			_tmp6_ = _object_it;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp7_ = gee_iterator_get (_tmp6_);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			object = (DataObject*) _tmp9_;
-#line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp10_ = map;
-#line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp11_ = object;
+			object = (DataObject*) _tmp7_;
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
+			_tmp8_ = object;
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp13_ = (Alteration*) _tmp12_;
+			_tmp9_ = gee_map_get (map, _tmp8_);
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp14_ = alteration_has_subject (_tmp13_, "image");
+			_tmp10_ = (Alteration*) _tmp9_;
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp15_ = !_tmp14_;
+			_tmp11_ = !alteration_has_subject (_tmp10_, "image");
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_alteration_unref0 (_tmp13_);
+			_alteration_unref0 (_tmp10_);
 #line 280 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (_tmp15_) {
+			if (_tmp11_) {
 #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_g_object_unref0 (object);
 #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				continue;
-#line 1614 "PixbufCache.c"
+#line 1639 "PixbufCache.c"
 			}
 #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp16_ = object;
+			_tmp12_ = object;
 #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo));
+			_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo));
 #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			photo = _tmp17_;
+			photo = _tmp13_;
 #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp18_ = self->priv->in_progress;
+			_tmp14_ = self->priv->in_progress;
 #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp19_ = photo;
+			_tmp15_ = photo;
 #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_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 1630 "PixbufCache.c"
-				GeeHashMap* _tmp21_;
-				Photo* _tmp22_;
-				gpointer _tmp23_;
-				PixbufCacheFetchJob* _tmp24_;
-				GeeHashMap* _tmp25_;
-				Photo* _tmp26_;
+			if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_)) {
+#line 1653 "PixbufCache.c"
+				GeeHashMap* _tmp16_;
+				Photo* _tmp17_;
+				gpointer _tmp18_;
+				PixbufCacheFetchJob* _tmp19_;
+				GeeHashMap* _tmp20_;
+				Photo* _tmp21_;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp21_ = self->priv->in_progress;
+				_tmp16_ = self->priv->in_progress;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp22_ = photo;
+				_tmp17_ = photo;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
+				_tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_);
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp24_ = (PixbufCacheFetchJob*) _tmp23_;
+				_tmp19_ = (PixbufCacheFetchJob*) _tmp18_;
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_BACKGROUND_JOB, BackgroundJob));
+				background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 288 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_background_job_unref0 (_tmp24_);
+				_background_job_unref0 (_tmp19_);
 #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp25_ = self->priv->in_progress;
+				_tmp20_ = self->priv->in_progress;
 #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp26_ = photo;
+				_tmp21_ = 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 1655 "PixbufCache.c"
+				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_, NULL);
+#line 1678 "PixbufCache.c"
 			} else {
-				GeeHashMap* _tmp27_;
-				Photo* _tmp28_;
-				gboolean _tmp29_;
-#line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp27_ = self->priv->cache;
+				GeeHashMap* _tmp22_;
+				Photo* _tmp23_;
 #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp28_ = photo;
+				_tmp22_ = self->priv->cache;
 #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				_tmp29_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
+				_tmp23_ = photo;
 #line 290 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-				if (!_tmp29_) {
+				if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_)) {
 #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_g_object_unref0 (photo);
 #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_g_object_unref0 (object);
 #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					continue;
-#line 1674 "PixbufCache.c"
+#line 1694 "PixbufCache.c"
 				}
 			}
 #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp30_ = photo;
+			_tmp24_ = photo;
 #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			pixbuf_cache_decache (self, _tmp30_);
+			pixbuf_cache_decache (self, _tmp24_);
 #line 301 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp31_ = photo;
+			_tmp25_ = photo;
 #line 301 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			pixbuf_cache_prefetch (self, _tmp31_, BACKGROUND_JOB_JOB_PRIORITY_HIGH, FALSE);
+			pixbuf_cache_prefetch (self, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_HIGH, FALSE);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (photo);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1689 "PixbufCache.c"
+#line 1709 "PixbufCache.c"
 		}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1693 "PixbufCache.c"
+#line 1713 "PixbufCache.c"
 	}
 }
 
 
-static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* removed) {
+static void
+pixbuf_cache_on_sources_removed (PixbufCache* self,
+                                 GeeIterable* removed)
+{
 #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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 1703 "PixbufCache.c"
+#line 1726 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_;
-		GeeIterator* _tmp1_;
-#line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp0_ = removed;
+		GeeIterator* _tmp0_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_iterable_iterator (_tmp0_);
+		_tmp0_ = gee_iterable_iterator (removed);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_object_it = _tmp1_;
+		_object_it = _tmp0_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1716 "PixbufCache.c"
-			GeeIterator* _tmp2_;
-			gboolean _tmp3_;
+#line 1736 "PixbufCache.c"
+			GeeIterator* _tmp1_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_;
-			gpointer _tmp5_;
+			GeeIterator* _tmp2_;
+			gpointer _tmp3_;
 			Photo* photo = NULL;
-			DataObject* _tmp6_;
+			DataObject* _tmp4_;
+			Photo* _tmp5_;
+			Photo* _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"
-			_tmp3_ = gee_iterator_next (_tmp2_);
+			_tmp1_ = _object_it;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp3_) {
+			if (!gee_iterator_next (_tmp1_)) {
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1735 "PixbufCache.c"
+#line 1752 "PixbufCache.c"
 			}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp4_ = _object_it;
+			_tmp2_ = _object_it;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp5_ = gee_iterator_get (_tmp4_);
+			_tmp3_ = gee_iterator_get (_tmp2_);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			object = (DataObject*) _tmp5_;
+			object = (DataObject*) _tmp3_;
 #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp6_ = object;
+			_tmp4_ = object;
 #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO) ? ((Photo*) _tmp6_) : NULL);
+			_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PHOTO) ? ((Photo*) _tmp4_) : NULL);
 #line 307 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			photo = _tmp7_;
+			photo = _tmp5_;
 #line 308 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp8_ = photo;
+			_tmp6_ = photo;
 #line 308 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_vala_assert (_tmp8_ != NULL, "photo != null");
+			_vala_assert (_tmp6_ != NULL, "photo != null");
 #line 310 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp9_ = photo;
+			_tmp7_ = photo;
 #line 310 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			pixbuf_cache_decache (self, _tmp9_);
+			pixbuf_cache_decache (self, _tmp7_);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (photo);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1761 "PixbufCache.c"
+#line 1778 "PixbufCache.c"
 		}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1765 "PixbufCache.c"
+#line 1782 "PixbufCache.c"
 	}
 }
 
 
-static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) {
+static GdkPixbuf*
+pixbuf_cache_get_cached (PixbufCache* self,
+                         Photo* photo)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
 	GeeHashMap* _tmp0_;
-	Photo* _tmp1_;
-	gpointer _tmp2_;
-	GdkPixbuf* _tmp3_;
+	gpointer _tmp1_;
+	GdkPixbuf* _tmp2_;
 #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"
@@ -1780,38 +1799,33 @@ static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) {
 #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp0_ = self->priv->cache;
 #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo;
-#line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo);
 #line 315 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf = (GdkPixbuf*) _tmp2_;
+	pixbuf = (GdkPixbuf*) _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = pixbuf;
+	_tmp2_ = pixbuf;
 #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp3_ != NULL) {
-#line 1793 "PixbufCache.c"
-		Photo* _tmp4_;
+	if (_tmp2_ != NULL) {
 #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 1799 "PixbufCache.c"
+		pixbuf_cache_prioritize (self, photo);
+#line 1812 "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 1805 "PixbufCache.c"
+#line 1818 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
+static void
+pixbuf_cache_prioritize (PixbufCache* self,
+                         Photo* photo)
+{
 	gint index = 0;
 	GeeArrayList* _tmp0_;
-	Photo* _tmp1_;
+	gint _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"
@@ -1819,60 +1833,53 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 #line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp0_ = self->priv->lru;
 #line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo;
-#line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_abstract_list_index_of (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	index = _tmp2_;
+	index = gee_abstract_list_index_of (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), photo);
 #line 325 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = index;
+	_tmp1_ = index;
 #line 325 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_vala_assert (_tmp3_ >= 0, "index >= 0");
+	_vala_assert (_tmp1_ >= 0, "index >= 0");
 #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = index;
+	_tmp2_ = index;
 #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (_tmp4_ > 0) {
-#line 1836 "PixbufCache.c"
-		GeeArrayList* _tmp5_;
-		gint _tmp6_;
-		gpointer _tmp7_;
-		Photo* _tmp8_;
-		GeeArrayList* _tmp9_;
-		Photo* _tmp10_;
+	if (_tmp2_ > 0) {
+#line 1846 "PixbufCache.c"
+		GeeArrayList* _tmp3_;
+		gint _tmp4_;
+		gpointer _tmp5_;
+		Photo* _tmp6_;
+		GeeArrayList* _tmp7_;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp5_ = self->priv->lru;
+		_tmp3_ = self->priv->lru;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = index;
+		_tmp4_ = index;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp7_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp6_);
+		_tmp5_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp4_);
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp8_ = (Photo*) _tmp7_;
+		_tmp6_ = (Photo*) _tmp5_;
 #line 328 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp9_ = self->priv->lru;
+		_tmp7_ = self->priv->lru;
 #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_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 1859 "PixbufCache.c"
+		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, photo);
+#line 1866 "PixbufCache.c"
 	}
 }
 
 
-static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pixbuf) {
-	Photo* _tmp0_;
-	GeeHashMap* _tmp1_;
-	Photo* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	GeeArrayList* _tmp4_;
-	Photo* _tmp5_;
-	GeeArrayList* _tmp20_;
+static void
+pixbuf_cache_encache (PixbufCache* self,
+                      Photo* photo,
+                      GdkPixbuf* pixbuf)
+{
+	GeeHashMap* _tmp0_;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	GeeHashMap* _tmp19_;
+	gint _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"
@@ -1880,115 +1887,107 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 333 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 335 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = photo;
-#line 335 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	pixbuf_cache_decache (self, _tmp0_);
-#line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = self->priv->cache;
+	pixbuf_cache_decache (self, photo);
 #line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = photo;
-#line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = pixbuf;
+	_tmp0_ = self->priv->cache;
 #line 337 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, pixbuf);
 #line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = self->priv->lru;
+	_tmp1_ = self->priv->lru;
 #line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5_ = photo;
-#line 338 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp5_);
+	gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, photo);
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	while (TRUE) {
-#line 1903 "PixbufCache.c"
+#line 1902 "PixbufCache.c"
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		Photo* cached_photo = NULL;
 		GeeArrayList* _tmp6_;
-		gint _tmp7_;
+		GeeArrayList* _tmp7_;
 		gint _tmp8_;
 		gint _tmp9_;
-		Photo* cached_photo = NULL;
-		GeeArrayList* _tmp10_;
-		GeeArrayList* _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
-		gpointer _tmp14_;
-		Photo* _tmp15_;
+		gpointer _tmp10_;
+		Photo* _tmp11_;
 		gboolean removed = FALSE;
-		GeeHashMap* _tmp16_;
-		Photo* _tmp17_;
-		gboolean _tmp18_;
-		gboolean _tmp19_;
+		GeeHashMap* _tmp12_;
+		Photo* _tmp13_;
+		gboolean _tmp14_;
+		gboolean _tmp15_;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = self->priv->lru;
+		_tmp2_ = self->priv->lru;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp8_ = _tmp7_;
+		_tmp4_ = _tmp3_;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp9_ = self->priv->max_count;
+		_tmp5_ = self->priv->max_count;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		if (!(_tmp8_ > _tmp9_)) {
+		if (!(_tmp4_ > _tmp5_)) {
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1932 "PixbufCache.c"
+#line 1931 "PixbufCache.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp10_ = self->priv->lru;
+		_tmp6_ = self->priv->lru;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp11_ = self->priv->lru;
+		_tmp7_ = self->priv->lru;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp13_ = _tmp12_;
+		_tmp9_ = _tmp8_;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp14_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_ - 1);
+		_tmp10_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_ - 1);
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		cached_photo = (Photo*) _tmp14_;
+		cached_photo = (Photo*) _tmp10_;
 #line 342 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp15_ = cached_photo;
+		_tmp11_ = cached_photo;
 #line 342 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_vala_assert (_tmp15_ != NULL, "cached_photo != null");
+		_vala_assert (_tmp11_ != NULL, "cached_photo != null");
 #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp16_ = self->priv->cache;
+		_tmp12_ = self->priv->cache;
 #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp17_ = cached_photo;
+		_tmp13_ = cached_photo;
 #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp18_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
+		_tmp14_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, NULL);
 #line 344 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		removed = _tmp18_;
+		removed = _tmp14_;
 #line 345 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp19_ = removed;
+		_tmp15_ = removed;
 #line 345 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_vala_assert (_tmp19_, "removed");
+		_vala_assert (_tmp15_, "removed");
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (cached_photo);
-#line 1964 "PixbufCache.c"
+#line 1963 "PixbufCache.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp20_ = self->priv->lru;
+	_tmp16_ = self->priv->lru;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp22_ = _tmp21_;
+	_tmp18_ = _tmp17_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp23_ = self->priv->cache;
+	_tmp19_ = self->priv->cache;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+	_tmp20_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp25_ = _tmp24_;
+	_tmp21_ = _tmp20_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_vala_assert (_tmp22_ == _tmp25_, "lru.size == cache.size");
-#line 1980 "PixbufCache.c"
+	_vala_assert (_tmp18_ == _tmp21_, "lru.size == cache.size");
+#line 1979 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
+static void
+pixbuf_cache_decache (PixbufCache* self,
+                      Photo* photo)
+{
 	GeeHashMap* _tmp0_;
-	Photo* _tmp1_;
-	gboolean _tmp2_;
+	gboolean _tmp1_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp6_;
-	Photo* _tmp7_;
-	gboolean _tmp8_;
-	gboolean _tmp9_;
+	GeeArrayList* _tmp3_;
+	gboolean _tmp4_;
 #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,44 +1995,39 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp0_ = self->priv->cache;
 #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = photo;
-#line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
+	_tmp1_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, NULL);
 #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	if (!_tmp2_) {
-#line 2005 "PixbufCache.c"
-		GeeArrayList* _tmp3_;
-		Photo* _tmp4_;
-		gboolean _tmp5_;
+	if (!_tmp1_) {
+#line 2002 "PixbufCache.c"
+		GeeArrayList* _tmp2_;
 #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp3_ = self->priv->lru;
-#line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp4_ = photo;
-#line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp5_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
+		_tmp2_ = self->priv->lru;
 #line 353 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_vala_assert (!_tmp5_, "!lru.contains(photo)");
+		_vala_assert (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), photo), "!lru.contains(photo)");
 #line 355 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2019 "PixbufCache.c"
+#line 2010 "PixbufCache.c"
 	}
 #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = self->priv->lru;
+	_tmp3_ = self->priv->lru;
 #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp7_ = photo;
-#line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp8_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	removed = _tmp8_;
+	removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), photo);
 #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp9_ = removed;
+	_tmp4_ = removed;
 #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_vala_assert (_tmp9_, "removed");
-#line 2033 "PixbufCache.c"
+	_vala_assert (_tmp4_, "removed");
+#line 2020 "PixbufCache.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * closure,
+                                                     GValue * return_value,
+                                                     guint n_param_values,
+                                                     const GValue * param_values,
+                                                     gpointer invocation_hint,
+                                                     gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT_POINTER callback;
 	register GCClosure * cc;
@@ -2048,51 +2042,61 @@ 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 2052 "PixbufCache.c"
+#line 2046 "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 2058 "PixbufCache.c"
+#line 2052 "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 2064 "PixbufCache.c"
+#line 2058 "PixbufCache.c"
 }
 
 
-PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) {
+PixbufCachePixbufCacheBatch*
+pixbuf_cache_pixbuf_cache_batch_construct (GType object_type)
+{
 	PixbufCachePixbufCacheBatch * self = NULL;
 #line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (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 2074 "PixbufCache.c"
+#line 2070 "PixbufCache.c"
 }
 
 
-PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void) {
+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 2081 "PixbufCache.c"
+#line 2079 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) {
+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 2088 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_pixbuf_cache_batch_instance_init (PixbufCachePixbufCacheBatch * self) {
+static void
+pixbuf_cache_pixbuf_cache_batch_instance_init (PixbufCachePixbufCacheBatch * self)
+{
 }
 
 
-GType pixbuf_cache_pixbuf_cache_batch_get_type (void) {
+GType
+pixbuf_cache_pixbuf_cache_batch_get_type (void)
+{
 	static volatile gsize pixbuf_cache_pixbuf_cache_batch_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_pixbuf_cache_batch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PixbufCachePixbufCacheBatchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_pixbuf_cache_batch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCachePixbufCacheBatch), 0, (GInstanceInitFunc) pixbuf_cache_pixbuf_cache_batch_instance_init, NULL };
@@ -2104,19 +2108,22 @@ 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) {
+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_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	GCancellable* _tmp3_;
-	Semaphore* _tmp4_;
-	Semaphore* _tmp5_;
-	BackgroundJobJobPriority _tmp6_;
-	Photo* _tmp7_;
-	Photo* _tmp8_;
-	Scaling _tmp9_;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
+	Semaphore* _tmp2_;
+	Semaphore* _tmp3_;
+	Photo* _tmp4_;
+	Scaling _tmp5_;
 #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"
@@ -2124,48 +2131,40 @@ static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type,
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = owner;
+	_tmp0_ = g_cancellable_new ();
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = callback;
+	_tmp1_ = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1__target = callback_target;
-#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = g_cancellable_new ();
+	_tmp2_ = semaphore_new ();
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp3_ = _tmp2_;
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = semaphore_new ();
-#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp5_ = _tmp4_;
-#line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCacheFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp3_, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore));
+	self = (PixbufCacheFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, _tmp1_, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore));
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_abstract_semaphore_unref0 (_tmp5_);
+	_abstract_semaphore_unref0 (_tmp3_);
 #line 30 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp1_);
 #line 32 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp6_ = priority;
-#line 32 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->priority = _tmp6_;
-#line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp7_ = photo;
+	self->priority = priority;
 #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp8_ = _g_object_ref0 (_tmp7_);
+	_tmp4_ = _g_object_ref0 (photo);
 #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_g_object_unref0 (self->photo);
 #line 33 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->photo = _tmp8_;
+	self->photo = _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp9_ = *scaling;
+	_tmp5_ = *scaling;
 #line 34 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self->scaling = _tmp9_;
+	self->scaling = _tmp5_;
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2165 "PixbufCache.c"
+#line 2162 "PixbufCache.c"
 }
 
 
-static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base) {
+static BackgroundJobJobPriority
+pixbuf_cache_fetch_job_real_get_priority (BackgroundJob* base)
+{
 	PixbufCacheFetchJob * self;
 	BackgroundJobJobPriority result = 0;
 	BackgroundJobJobPriority _tmp0_;
@@ -2177,31 +2176,37 @@ static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (Backgr
 	result = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 2181 "PixbufCache.c"
+#line 2180 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass) {
+static void
+pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass)
+{
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_fetch_job_parent_class = g_type_class_peek_parent (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 2192 "PixbufCache.c"
+#line 2193 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) {
+static void
+pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self)
+{
 #line 25 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->pixbuf = NULL;
 #line 26 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->err = NULL;
-#line 2201 "PixbufCache.c"
+#line 2204 "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);
@@ -2213,11 +2218,13 @@ 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 2217 "PixbufCache.c"
+#line 2222 "PixbufCache.c"
 }
 
 
-static GType pixbuf_cache_fetch_job_get_type (void) {
+static GType
+pixbuf_cache_fetch_job_get_type (void)
+{
 	static volatile gsize pixbuf_cache_fetch_job_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_fetch_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_fetch_job_instance_init, NULL };
@@ -2229,14 +2236,17 @@ 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) {
+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_;
-	BackgroundJobJobPriority _tmp1_;
-	Photo* _tmp2_;
-	Scaling _tmp3_;
-	CompletionCallback _tmp4_;
-	void* _tmp4__target;
+	Scaling _tmp0_;
 #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"
@@ -2244,38 +2254,37 @@ static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (G
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
 #line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = owner;
-#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = priority;
-#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = photo;
-#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = *scaling;
+	_tmp0_ = *scaling;
 #line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = callback;
-#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4__target = callback_target;
-#line 45 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
+	self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, owner, priority, photo, &_tmp0_, callback, callback_target);
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
 #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) {
+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 2270 "PixbufCache.c"
+#line 2277 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
+static void
+pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base)
+{
 	PixbufCacheBaselineFetchJob * self;
 	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 2279 "PixbufCache.c"
+#line 2288 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -2292,7 +2301,7 @@ 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 2296 "PixbufCache.c"
+#line 2305 "PixbufCache.c"
 			goto __catch462_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2305,7 +2314,7 @@ 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 2309 "PixbufCache.c"
+#line 2318 "PixbufCache.c"
 	}
 	goto __finally462;
 	__catch462_g_error:
@@ -2327,7 +2336,7 @@ 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 2331 "PixbufCache.c"
+#line 2340 "PixbufCache.c"
 	}
 	__finally462:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2338,25 +2347,31 @@ 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 2342 "PixbufCache.c"
+#line 2351 "PixbufCache.c"
 	}
 }
 
 
-static void pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetchJobClass * klass) {
+static void
+pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetchJobClass * klass)
+{
 #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 2352 "PixbufCache.c"
+#line 2363 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_baseline_fetch_job_instance_init (PixbufCacheBaselineFetchJob * self) {
+static void
+pixbuf_cache_baseline_fetch_job_instance_init (PixbufCacheBaselineFetchJob * self)
+{
 }
 
 
-static GType pixbuf_cache_baseline_fetch_job_get_type (void) {
+static GType
+pixbuf_cache_baseline_fetch_job_get_type (void)
+{
 	static volatile gsize pixbuf_cache_baseline_fetch_job_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_baseline_fetch_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheBaselineFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_baseline_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheBaselineFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_baseline_fetch_job_instance_init, NULL };
@@ -2368,14 +2383,17 @@ 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) {
+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_;
-	BackgroundJobJobPriority _tmp1_;
-	Photo* _tmp2_;
-	Scaling _tmp3_;
-	CompletionCallback _tmp4_;
-	void* _tmp4__target;
+	Scaling _tmp0_;
 #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"
@@ -2383,38 +2401,37 @@ static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
 #line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp0_ = owner;
-#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = priority;
-#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = photo;
-#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp3_ = *scaling;
-#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4_ = callback;
+	_tmp0_ = *scaling;
 #line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp4__target = callback_target;
-#line 60 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
+	self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, owner, priority, photo, &_tmp0_, callback, callback_target);
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2402 "PixbufCache.c"
+#line 2410 "PixbufCache.c"
 }
 
 
-static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
+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 2409 "PixbufCache.c"
+#line 2424 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
+static void
+pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base)
+{
 	PixbufCacheMasterFetchJob * self;
 	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 2418 "PixbufCache.c"
+#line 2435 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -2431,7 +2448,7 @@ 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 2435 "PixbufCache.c"
+#line 2452 "PixbufCache.c"
 			goto __catch463_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2444,7 +2461,7 @@ 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 2448 "PixbufCache.c"
+#line 2465 "PixbufCache.c"
 	}
 	goto __finally463;
 	__catch463_g_error:
@@ -2466,7 +2483,7 @@ 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 2470 "PixbufCache.c"
+#line 2487 "PixbufCache.c"
 	}
 	__finally463:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2477,25 +2494,31 @@ 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 2481 "PixbufCache.c"
+#line 2498 "PixbufCache.c"
 	}
 }
 
 
-static void pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobClass * klass) {
+static void
+pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobClass * klass)
+{
 #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 2491 "PixbufCache.c"
+#line 2510 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_master_fetch_job_instance_init (PixbufCacheMasterFetchJob * self) {
+static void
+pixbuf_cache_master_fetch_job_instance_init (PixbufCacheMasterFetchJob * self)
+{
 }
 
 
-static GType pixbuf_cache_master_fetch_job_get_type (void) {
+static GType
+pixbuf_cache_master_fetch_job_get_type (void)
+{
 	static volatile gsize pixbuf_cache_master_fetch_job_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_master_fetch_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheMasterFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_master_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCacheMasterFetchJob), 0, (GInstanceInitFunc) pixbuf_cache_master_fetch_job_instance_init, NULL };
@@ -2507,7 +2530,9 @@ static GType pixbuf_cache_master_fetch_job_get_type (void) {
 }
 
 
-static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
+static void
+pixbuf_cache_class_init (PixbufCacheClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2516,11 +2541,13 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	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"
+#line 2545 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_instance_init (PixbufCache * self) {
+static void
+pixbuf_cache_instance_init (PixbufCache * self)
+{
 	GeeHashMap* _tmp0_;
 	GeeArrayList* _tmp1_;
 	GeeHashMap* _tmp2_;
@@ -2538,11 +2565,13 @@ 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 2542 "PixbufCache.c"
+#line 2569 "PixbufCache.c"
 }
 
 
-static void pixbuf_cache_finalize (GObject * obj) {
+static void
+pixbuf_cache_finalize (GObject * obj)
+{
 	PixbufCache * self;
 	PixbufCachePhotoType _tmp0_;
 	SourceCollection* _tmp3_;
@@ -2553,7 +2582,7 @@ static void pixbuf_cache_finalize (GObject * obj) {
 	_tmp0_ = self->priv->type;
 #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp0_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
-#line 2557 "PixbufCache.c"
+#line 2586 "PixbufCache.c"
 		SourceCollection* _tmp1_;
 		guint _tmp2_;
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2562,7 +2591,7 @@ static void pixbuf_cache_finalize (GObject * obj) {
 		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 2566 "PixbufCache.c"
+#line 2595 "PixbufCache.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp3_ = self->priv->sources;
@@ -2570,7 +2599,7 @@ 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 2574 "PixbufCache.c"
+#line 2603 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeHashMap* _tmp5_;
@@ -2597,40 +2626,37 @@ static void pixbuf_cache_finalize (GObject * obj) {
 		_job_it = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 2601 "PixbufCache.c"
+#line 2630 "PixbufCache.c"
 			GeeIterator* _tmp11_;
-			gboolean _tmp12_;
 			PixbufCacheFetchJob* job = NULL;
-			GeeIterator* _tmp13_;
-			gpointer _tmp14_;
-			PixbufCacheFetchJob* _tmp15_;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			PixbufCacheFetchJob* _tmp14_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp11_ = _job_it;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp12_ = gee_iterator_next (_tmp11_);
-#line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			if (!_tmp12_) {
+			if (!gee_iterator_next (_tmp11_)) {
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 2616 "PixbufCache.c"
+#line 2642 "PixbufCache.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp13_ = _job_it;
+			_tmp12_ = _job_it;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
+			_tmp13_ = gee_iterator_get (_tmp12_);
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			job = (PixbufCacheFetchJob*) _tmp14_;
+			job = (PixbufCacheFetchJob*) _tmp13_;
 #line 115 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			_tmp15_ = job;
+			_tmp14_ = job;
 #line 115 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 2630 "PixbufCache.c"
+#line 2656 "PixbufCache.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 2634 "PixbufCache.c"
+#line 2660 "PixbufCache.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -2642,11 +2668,13 @@ 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 2646 "PixbufCache.c"
+#line 2672 "PixbufCache.c"
 }
 
 
-GType pixbuf_cache_get_type (void) {
+GType
+pixbuf_cache_get_type (void)
+{
 	static volatile gsize pixbuf_cache_type_id__volatile = 0;
 	if (g_once_init_enter (&pixbuf_cache_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PixbufCacheClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) pixbuf_cache_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PixbufCache), 0, (GInstanceInitFunc) pixbuf_cache_instance_init, NULL };