Merge branch 'release/0.26.4-1'0.26.4-1

4 files changed, 237 insertions, 237 deletions

diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index cfb54d3..f2ba99a 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.34.7, the Vala compiler
+/* BackgroundJob.c generated by valac 0.36.6, the Vala compiler
  * generated from BackgroundJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -209,7 +209,7 @@ enum  {
 	NOTIFICATION_OBJECT_DUMMY_PROPERTY
 };
 NotificationObject* notification_object_construct (GType object_type);
-static void notification_object_finalize (NotificationObject* obj);
+static void notification_object_finalize (NotificationObject * obj);
 GType interlocked_notification_object_get_type (void) G_GNUC_CONST;
 gpointer abstract_semaphore_ref (gpointer instance);
 void abstract_semaphore_unref (gpointer instance);
@@ -230,7 +230,7 @@ void abstract_semaphore_wait (AbstractSemaphore* self);
 void interlocked_notification_object_internal_completed (InterlockedNotificationObject* self);
 void abstract_semaphore_notify (AbstractSemaphore* self);
 InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type);
-static void interlocked_notification_object_finalize (NotificationObject* obj);
+static void interlocked_notification_object_finalize (NotificationObject * obj);
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
 #define BACKGROUND_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BACKGROUND_JOB, BackgroundJobPrivate))
 enum  {
@@ -269,8 +269,8 @@ static gboolean _background_job_on_notification_ready_gsource_func (gpointer sel
 enum  {
 	BACKGROUND_JOB_NOTIFICATION_JOB_DUMMY_PROPERTY
 };
-static void background_job_notification_job_finalize (BackgroundJobNotificationJob* obj);
-static void background_job_finalize (BackgroundJob* obj);
+static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj);
+static void background_job_finalize (BackgroundJob * obj);
 
 
 NotificationObject* notification_object_construct (GType object_type) {
@@ -325,7 +325,7 @@ static gchar* value_notification_object_collect_value (GValue* value, guint n_co
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 328 "BackgroundJob.c"
-		NotificationObject* object;
+		NotificationObject * object;
 		object = collect_values[0].v_pointer;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -352,7 +352,7 @@ static gchar* value_notification_object_collect_value (GValue* value, guint n_co
 
 
 static gchar* value_notification_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	NotificationObject** object_p;
+	NotificationObject ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -404,7 +404,7 @@ gpointer value_get_notification_object (const GValue* value) {
 
 
 void value_set_notification_object (GValue* value, gpointer v_object) {
-	NotificationObject* old;
+	NotificationObject * old;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT));
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -435,7 +435,7 @@ void value_set_notification_object (GValue* value, gpointer v_object) {
 
 
 void value_take_notification_object (GValue* value, gpointer v_object) {
-	NotificationObject* old;
+	NotificationObject * old;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFICATION_OBJECT));
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -479,7 +479,7 @@ static void notification_object_instance_init (NotificationObject * self) {
 }
 
 
-static void notification_object_finalize (NotificationObject* obj) {
+static void notification_object_finalize (NotificationObject * obj) {
 	NotificationObject * self;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFICATION_OBJECT, NotificationObject);
@@ -504,7 +504,7 @@ GType notification_object_get_type (void) {
 
 
 gpointer notification_object_ref (gpointer instance) {
-	NotificationObject* self;
+	NotificationObject * self;
 	self = instance;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -515,7 +515,7 @@ gpointer notification_object_ref (gpointer instance) {
 
 
 void notification_object_unref (gpointer instance) {
-	NotificationObject* self;
+	NotificationObject * self;
 	self = instance;
 #line 34 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -529,7 +529,7 @@ void notification_object_unref (gpointer instance) {
 
 
 void interlocked_notification_object_internal_wait_for_completion (InterlockedNotificationObject* self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 41 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self));
 #line 42 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -541,7 +541,7 @@ void interlocked_notification_object_internal_wait_for_completion (InterlockedNo
 
 
 void interlocked_notification_object_internal_completed (InterlockedNotificationObject* self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_INTERLOCKED_NOTIFICATION_OBJECT (self));
 #line 47 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -574,7 +574,7 @@ static void interlocked_notification_object_class_init (InterlockedNotificationO
 
 
 static void interlocked_notification_object_instance_init (InterlockedNotificationObject * self) {
-	Semaphore* _tmp0_ = NULL;
+	Semaphore* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self->priv = INTERLOCKED_NOTIFICATION_OBJECT_GET_PRIVATE (self);
 #line 38 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -585,7 +585,7 @@ static void interlocked_notification_object_instance_init (InterlockedNotificati
 }
 
 
-static void interlocked_notification_object_finalize (NotificationObject* obj) {
+static void interlocked_notification_object_finalize (NotificationObject * obj) {
 	InterlockedNotificationObject * self;
 #line 37 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTERLOCKED_NOTIFICATION_OBJECT, InterlockedNotificationObject);
@@ -611,7 +611,7 @@ GType interlocked_notification_object_get_type (void) {
 
 gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other) {
 	gint result = 0;
-	BackgroundJobJobPriority _tmp0_ = 0;
+	BackgroundJobJobPriority _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = other;
 #line 75 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -624,8 +624,8 @@ gint background_job_job_priority_compare (BackgroundJobJobPriority self, Backgro
 
 gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b) {
 	gint result = 0;
-	BackgroundJobJobPriority _tmp0_ = 0;
-	BackgroundJobJobPriority _tmp1_ = 0;
+	BackgroundJobJobPriority _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = b;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -666,16 +666,16 @@ static gpointer _abstract_semaphore_ref0 (gpointer self) {
 
 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* self = NULL;
-	GObject* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	CompletionCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	GCancellable* _tmp3_ = NULL;
-	GCancellable* _tmp4_ = NULL;
-	CancellationCallback _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	AbstractSemaphore* _tmp6_ = NULL;
-	AbstractSemaphore* _tmp7_ = NULL;
+	GObject* _tmp0_;
+	GObject* _tmp1_;
+	CompletionCallback _tmp2_;
+	void* _tmp2__target;
+	GCancellable* _tmp3_;
+	GCancellable* _tmp4_;
+	CancellationCallback _tmp5_;
+	void* _tmp5__target;
+	AbstractSemaphore* _tmp6_;
+	AbstractSemaphore* _tmp7_;
 #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail ((owner == NULL) || G_IS_OBJECT (owner), NULL);
 #line 113 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -769,11 +769,11 @@ BackgroundJobJobPriority background_job_get_priority (BackgroundJob* self) {
 
 gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b) {
 	gint result = 0;
-	BackgroundJob* _tmp0_ = NULL;
-	BackgroundJobJobPriority _tmp1_ = 0;
-	BackgroundJob* _tmp2_ = NULL;
-	BackgroundJobJobPriority _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	BackgroundJob* _tmp0_;
+	BackgroundJobJobPriority _tmp1_;
+	BackgroundJob* _tmp2_;
+	BackgroundJobJobPriority _tmp3_;
+	gint _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (a), 0);
 #line 130 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -798,9 +798,9 @@ gint background_job_priority_compare_func (BackgroundJob* a, BackgroundJob* b) {
 
 gint64 background_job_priority_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = a;
 #line 136 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -816,7 +816,7 @@ gint64 background_job_priority_comparator (void* a, void* b) {
 
 
 void background_job_set_completion_priority (BackgroundJob* self, gint priority) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 141 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -828,7 +828,7 @@ void background_job_set_completion_priority (BackgroundJob* self, gint priority)
 
 
 void background_job_set_notification_priority (BackgroundJob* self, gint priority) {
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 146 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -840,7 +840,7 @@ void background_job_set_notification_priority (BackgroundJob* self, gint priorit
 
 
 void background_job_wait_for_completion (BackgroundJob* self) {
-	AbstractSemaphore* _tmp0_ = NULL;
+	AbstractSemaphore* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 153 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -848,7 +848,7 @@ void background_job_wait_for_completion (BackgroundJob* self) {
 #line 153 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 851 "BackgroundJob.c"
-		AbstractSemaphore* _tmp1_ = NULL;
+		AbstractSemaphore* _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->semaphore;
 #line 154 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -860,8 +860,8 @@ void background_job_wait_for_completion (BackgroundJob* self) {
 
 GCancellable* background_job_get_cancellable (BackgroundJob* self) {
 	GCancellable* result = NULL;
-	GCancellable* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
 #line 157 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), NULL);
 #line 158 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -879,7 +879,7 @@ GCancellable* background_job_get_cancellable (BackgroundJob* self) {
 gboolean background_job_is_cancelled (BackgroundJob* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GCancellable* _tmp1_ = NULL;
+	GCancellable* _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -887,8 +887,8 @@ gboolean background_job_is_cancelled (BackgroundJob* self) {
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp1_ != NULL) {
 #line 890 "BackgroundJob.c"
-		GCancellable* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		GCancellable* _tmp2_;
+		gboolean _tmp3_;
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp2_ = self->priv->cancellable;
 #line 162 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -910,7 +910,7 @@ gboolean background_job_is_cancelled (BackgroundJob* self) {
 
 
 void background_job_cancel (BackgroundJob* self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 166 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -918,7 +918,7 @@ void background_job_cancel (BackgroundJob* self) {
 #line 166 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 921 "BackgroundJob.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 167 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -945,14 +945,14 @@ static gboolean _background_job_on_notify_completion_gsource_func (gpointer self
 
 
 void background_job_internal_notify_completion (BackgroundJob* self) {
-	AbstractSemaphore* _tmp0_ = NULL;
+	AbstractSemaphore* _tmp0_;
 	gboolean _tmp2_ = FALSE;
-	CompletionCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
+	CompletionCallback _tmp3_;
+	void* _tmp3__target;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	BackgroundJob* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
+	gboolean _tmp6_;
+	BackgroundJob* _tmp8_;
+	gint _tmp9_;
 #line 171 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
 #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -960,7 +960,7 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 172 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_ != NULL) {
 #line 963 "BackgroundJob.c"
-		AbstractSemaphore* _tmp1_ = NULL;
+		AbstractSemaphore* _tmp1_;
 #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->semaphore;
 #line 173 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -974,8 +974,8 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp3_ == NULL) {
 #line 977 "BackgroundJob.c"
-		CancellationCallback _tmp4_ = NULL;
-		void* _tmp4__target = NULL;
+		CancellationCallback _tmp4_;
+		void* _tmp4__target;
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp4_ = self->priv->cancellation;
 #line 175 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -999,8 +999,8 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp6_) {
 #line 1002 "BackgroundJob.c"
-		CancellationCallback _tmp7_ = NULL;
-		void* _tmp7__target = NULL;
+		CancellationCallback _tmp7_;
+		void* _tmp7__target;
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp7_ = self->priv->cancellation;
 #line 178 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1035,7 +1035,7 @@ void background_job_internal_notify_completion (BackgroundJob* self) {
 
 static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 188 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
 #line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1043,8 +1043,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 193 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp0_) {
 #line 1046 "BackgroundJob.c"
-		CancellationCallback _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
+		CancellationCallback _tmp1_;
+		void* _tmp1__target;
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp1_ = self->priv->cancellation;
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1052,8 +1052,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 194 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (_tmp1_ != NULL) {
 #line 1055 "BackgroundJob.c"
-			CancellationCallback _tmp2_ = NULL;
-			void* _tmp2__target = NULL;
+			CancellationCallback _tmp2_;
+			void* _tmp2__target;
 #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp2_ = self->priv->cancellation;
 #line 195 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1063,8 +1063,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 1064 "BackgroundJob.c"
 		}
 	} else {
-		CompletionCallback _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
+		CompletionCallback _tmp3_;
+		void* _tmp3__target;
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp3_ = self->priv->callback;
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1072,8 +1072,8 @@ static gboolean background_job_on_notify_completion (BackgroundJob* self) {
 #line 197 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (_tmp3_ != NULL) {
 #line 1075 "BackgroundJob.c"
-			CompletionCallback _tmp4_ = NULL;
-			void* _tmp4__target = NULL;
+			CompletionCallback _tmp4_;
+			void* _tmp4__target;
 #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp4_ = self->priv->callback;
 #line 198 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1112,11 +1112,11 @@ static gpointer _notification_object_ref0 (gpointer self) {
 
 
 void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user) {
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	InterlockedNotificationObject* interlocked = NULL;
-	NotificationObject* _tmp8_ = NULL;
-	InterlockedNotificationObject* _tmp9_ = NULL;
-	InterlockedNotificationObject* _tmp10_ = NULL;
+	NotificationObject* _tmp8_;
+	InterlockedNotificationObject* _tmp9_;
+	InterlockedNotificationObject* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 209 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (self));
@@ -1124,19 +1124,19 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 	g_return_if_fail ((user == NULL) || IS_NOTIFICATION_OBJECT (user));
 #line 1126 "BackgroundJob.c"
 	{
-		GeeArrayList* _tmp0_ = NULL;
+		GeeArrayList* _tmp0_;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp0_ = background_job_notify_queue;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_rec_mutex_lock (&__lock_background_job_notify_queue);
 #line 1133 "BackgroundJob.c"
 		{
-			GeeArrayList* _tmp1_ = NULL;
-			NotificationCallback _tmp2_ = NULL;
-			void* _tmp2__target = NULL;
-			NotificationObject* _tmp3_ = NULL;
-			BackgroundJobNotificationJob* _tmp4_ = NULL;
-			BackgroundJobNotificationJob* _tmp5_ = NULL;
+			GeeArrayList* _tmp1_;
+			NotificationCallback _tmp2_;
+			void* _tmp2__target;
+			NotificationObject* _tmp3_;
+			BackgroundJobNotificationJob* _tmp4_;
+			BackgroundJobNotificationJob* _tmp5_;
 #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp1_ = background_job_notify_queue;
 #line 211 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1157,7 +1157,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 		}
 		__finally13:
 		{
-			GeeArrayList* _tmp6_ = NULL;
+			GeeArrayList* _tmp6_;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp6_ = background_job_notify_queue;
 #line 210 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1190,7 +1190,7 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 #line 219 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp10_ != NULL) {
 #line 1193 "BackgroundJob.c"
-		InterlockedNotificationObject* _tmp11_ = NULL;
+		InterlockedNotificationObject* _tmp11_;
 #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp11_ = interlocked;
 #line 220 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1206,19 +1206,19 @@ void background_job_notify (BackgroundJob* self, NotificationCallback callback,
 static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 	gboolean result = FALSE;
 	BackgroundJobNotificationJob* notification_job = NULL;
-	BackgroundJobNotificationJob* _tmp8_ = NULL;
-	BackgroundJobNotificationJob* _tmp9_ = NULL;
-	NotificationCallback _tmp10_ = NULL;
-	void* _tmp10__target = NULL;
-	BackgroundJobNotificationJob* _tmp11_ = NULL;
-	BackgroundJob* _tmp12_ = NULL;
-	BackgroundJobNotificationJob* _tmp13_ = NULL;
-	NotificationObject* _tmp14_ = NULL;
+	BackgroundJobNotificationJob* _tmp8_;
+	BackgroundJobNotificationJob* _tmp9_;
+	NotificationCallback _tmp10_;
+	void* _tmp10__target;
+	BackgroundJobNotificationJob* _tmp11_;
+	BackgroundJob* _tmp12_;
+	BackgroundJobNotificationJob* _tmp13_;
+	NotificationObject* _tmp14_;
 	InterlockedNotificationObject* interlocked = NULL;
-	BackgroundJobNotificationJob* _tmp15_ = NULL;
-	NotificationObject* _tmp16_ = NULL;
-	InterlockedNotificationObject* _tmp17_ = NULL;
-	InterlockedNotificationObject* _tmp18_ = NULL;
+	BackgroundJobNotificationJob* _tmp15_;
+	NotificationObject* _tmp16_;
+	InterlockedNotificationObject* _tmp17_;
+	InterlockedNotificationObject* _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
@@ -1226,16 +1226,16 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 	notification_job = NULL;
 #line 1228 "BackgroundJob.c"
 	{
-		GeeArrayList* _tmp0_ = NULL;
+		GeeArrayList* _tmp0_;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp0_ = background_job_notify_queue;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_rec_mutex_lock (&__lock_background_job_notify_queue);
 #line 1235 "BackgroundJob.c"
 		{
-			GeeArrayList* _tmp1_ = NULL;
-			gint _tmp2_ = 0;
-			gint _tmp3_ = 0;
+			GeeArrayList* _tmp1_;
+			gint _tmp2_;
+			gint _tmp3_;
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp1_ = background_job_notify_queue;
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1245,8 +1245,8 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			if (_tmp3_ > 0) {
 #line 1248 "BackgroundJob.c"
-				GeeArrayList* _tmp4_ = NULL;
-				gpointer _tmp5_ = NULL;
+				GeeArrayList* _tmp4_;
+				gpointer _tmp5_;
 #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 				_tmp4_ = background_job_notify_queue;
 #line 229 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1260,7 +1260,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 		}
 		__finally14:
 		{
-			GeeArrayList* _tmp6_ = NULL;
+			GeeArrayList* _tmp6_;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp6_ = background_job_notify_queue;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1315,7 +1315,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (_tmp18_ != NULL) {
 #line 1318 "BackgroundJob.c"
-		InterlockedNotificationObject* _tmp19_ = NULL;
+		InterlockedNotificationObject* _tmp19_;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		_tmp19_ = interlocked;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1336,12 +1336,12 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 
 static BackgroundJobNotificationJob* background_job_notification_job_construct (GType object_type, NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) {
 	BackgroundJobNotificationJob* self = NULL;
-	NotificationCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	BackgroundJob* _tmp1_ = NULL;
-	BackgroundJob* _tmp2_ = NULL;
-	NotificationObject* _tmp3_ = NULL;
-	NotificationObject* _tmp4_ = NULL;
+	NotificationCallback _tmp0_;
+	void* _tmp0__target;
+	BackgroundJob* _tmp1_;
+	BackgroundJob* _tmp2_;
+	NotificationObject* _tmp3_;
+	NotificationObject* _tmp4_;
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (background_job), NULL);
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1427,7 +1427,7 @@ static gchar* background_job_value_notification_job_collect_value (GValue* value
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 1430 "BackgroundJob.c"
-		BackgroundJobNotificationJob* object;
+		BackgroundJobNotificationJob * object;
 		object = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1454,7 +1454,7 @@ static gchar* background_job_value_notification_job_collect_value (GValue* value
 
 
 static gchar* background_job_value_notification_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackgroundJobNotificationJob** object_p;
+	BackgroundJobNotificationJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -1506,7 +1506,7 @@ static gpointer background_job_value_get_notification_job (const GValue* value)
 
 
 static void background_job_value_set_notification_job (GValue* value, gpointer v_object) {
-	BackgroundJobNotificationJob* old;
+	BackgroundJobNotificationJob * old;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB));
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1537,7 +1537,7 @@ static void background_job_value_set_notification_job (GValue* value, gpointer v
 
 
 static void background_job_value_take_notification_job (GValue* value, gpointer v_object) {
-	BackgroundJobNotificationJob* old;
+	BackgroundJobNotificationJob * old;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB));
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1581,7 +1581,7 @@ static void background_job_notification_job_instance_init (BackgroundJobNotifica
 }
 
 
-static void background_job_notification_job_finalize (BackgroundJobNotificationJob* obj) {
+static void background_job_notification_job_finalize (BackgroundJobNotificationJob * obj) {
 	BackgroundJobNotificationJob * self;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, BackgroundJobNotificationJob);
@@ -1610,7 +1610,7 @@ static GType background_job_notification_job_get_type (void) {
 
 
 static gpointer background_job_notification_job_ref (gpointer instance) {
-	BackgroundJobNotificationJob* self;
+	BackgroundJobNotificationJob * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1621,7 +1621,7 @@ static gpointer background_job_notification_job_ref (gpointer instance) {
 
 
 static void background_job_notification_job_unref (gpointer instance) {
-	BackgroundJobNotificationJob* self;
+	BackgroundJobNotificationJob * self;
 	self = instance;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1676,7 +1676,7 @@ static gchar* value_background_job_collect_value (GValue* value, guint n_collect
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
 #line 1679 "BackgroundJob.c"
-		BackgroundJob* object;
+		BackgroundJob * object;
 		object = collect_values[0].v_pointer;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1703,7 +1703,7 @@ static gchar* value_background_job_collect_value (GValue* value, guint n_collect
 
 
 static gchar* value_background_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	BackgroundJob** object_p;
+	BackgroundJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!object_p) {
@@ -1755,7 +1755,7 @@ gpointer value_get_background_job (const GValue* value) {
 
 
 void value_set_background_job (GValue* value, gpointer v_object) {
-	BackgroundJob* old;
+	BackgroundJob * old;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1786,7 +1786,7 @@ void value_set_background_job (GValue* value, gpointer v_object) {
 
 
 void value_take_background_job (GValue* value, gpointer v_object) {
-	BackgroundJob* old;
+	BackgroundJob * old;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1815,7 +1815,7 @@ void value_take_background_job (GValue* value, gpointer v_object) {
 
 
 static void background_job_class_init (BackgroundJobClass * klass) {
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	background_job_parent_class = g_type_class_peek_parent (klass);
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1823,9 +1823,9 @@ static void background_job_class_init (BackgroundJobClass * klass) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_type_class_add_private (klass, sizeof (BackgroundJobPrivate));
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) background_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) background_job_real_execute;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) background_job_real_get_priority;
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*) (BackgroundJob *)) background_job_real_get_priority;
 #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_rec_mutex_init (&__lock_background_job_notify_queue);
 #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1853,7 +1853,7 @@ static void background_job_instance_init (BackgroundJob * self) {
 }
 
 
-static void background_job_finalize (BackgroundJob* obj) {
+static void background_job_finalize (BackgroundJob * obj) {
 	BackgroundJob * self;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_JOB, BackgroundJob);
@@ -1886,7 +1886,7 @@ GType background_job_get_type (void) {
 
 
 gpointer background_job_ref (gpointer instance) {
-	BackgroundJob* self;
+	BackgroundJob * self;
 	self = instance;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1897,7 +1897,7 @@ gpointer background_job_ref (gpointer instance) {
 
 
 void background_job_unref (gpointer instance) {
-	BackgroundJob* self;
+	BackgroundJob * self;
 	self = instance;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 5a3b050..c93420b 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.34.7, the Vala compiler
+/* Semaphore.c generated by valac 0.36.6, the Vala compiler
  * generated from Semaphore.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -183,7 +183,7 @@ static AbstractSemaphoreWaitAction abstract_semaphore_real_do_wait (AbstractSema
 gboolean abstract_semaphore_reset (AbstractSemaphore* self);
 gboolean abstract_semaphore_do_reset (AbstractSemaphore* self);
 static gboolean abstract_semaphore_real_do_reset (AbstractSemaphore* self);
-static void abstract_semaphore_finalize (AbstractSemaphore* obj);
+static void abstract_semaphore_finalize (AbstractSemaphore * obj);
 GType semaphore_get_type (void) G_GNUC_CONST;
 #define SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEMAPHORE, SemaphorePrivate))
 enum  {
@@ -193,7 +193,7 @@ Semaphore* semaphore_new (void);
 Semaphore* semaphore_construct (GType object_type);
 static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* base);
-static void semaphore_finalize (AbstractSemaphore* obj);
+static void semaphore_finalize (AbstractSemaphore * obj);
 GType countdown_semaphore_get_type (void) G_GNUC_CONST;
 #define COUNTDOWN_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphorePrivate))
 enum  {
@@ -203,7 +203,7 @@ CountdownSemaphore* countdown_semaphore_new (gint total);
 CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total);
 static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSemaphore* base);
-static void countdown_semaphore_finalize (AbstractSemaphore* obj);
+static void countdown_semaphore_finalize (AbstractSemaphore * obj);
 GType event_semaphore_get_type (void) G_GNUC_CONST;
 #define EVENT_SEMAPHORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SEMAPHORE, EventSemaphorePrivate))
 enum  {
@@ -214,7 +214,7 @@ EventSemaphore* event_semaphore_construct (GType object_type);
 static AbstractSemaphoreNotifyAction event_semaphore_real_do_notify (AbstractSemaphore* base);
 static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemaphore* base);
 static gboolean event_semaphore_real_do_reset (AbstractSemaphore* base);
-static void event_semaphore_finalize (AbstractSemaphore* obj);
+static void event_semaphore_finalize (AbstractSemaphore * obj);
 static void _vala_clear_GMutex (GMutex * mutex);
 static void _vala_clear_GRecMutex (GRecMutex * mutex);
 static void _vala_clear_GRWLock (GRWLock * mutex);
@@ -260,8 +260,8 @@ GType abstract_semaphore_wait_action_get_type (void) {
 AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSemaphoreType type) {
 	AbstractSemaphore* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	AbstractSemaphoreType _tmp1_ = 0;
-	AbstractSemaphoreType _tmp3_ = 0;
+	AbstractSemaphoreType _tmp1_;
+	AbstractSemaphoreType _tmp3_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = (AbstractSemaphore*) g_type_create_instance (object_type);
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -272,7 +272,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema
 		_tmp0_ = TRUE;
 #line 274 "Semaphore.c"
 	} else {
-		AbstractSemaphoreType _tmp2_ = 0;
+		AbstractSemaphoreType _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp2_ = type;
 #line 31 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -292,7 +292,7 @@ AbstractSemaphore* abstract_semaphore_construct (GType object_type, AbstractSema
 
 
 static void abstract_semaphore_trigger (AbstractSemaphore* self) {
-	AbstractSemaphoreType _tmp0_ = 0;
+	AbstractSemaphoreType _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self));
 #line 37 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -312,8 +312,8 @@ static void abstract_semaphore_trigger (AbstractSemaphore* self) {
 
 void abstract_semaphore_notify (AbstractSemaphore* self) {
 	AbstractSemaphoreNotifyAction action = 0;
-	AbstractSemaphoreNotifyAction _tmp0_ = 0;
-	AbstractSemaphoreNotifyAction _tmp1_ = 0;
+	AbstractSemaphoreNotifyAction _tmp0_;
+	AbstractSemaphoreNotifyAction _tmp1_;
 #line 43 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (IS_ABSTRACT_SEMAPHORE (self));
 #line 44 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -346,7 +346,7 @@ void abstract_semaphore_notify (AbstractSemaphore* self) {
 		}
 		default:
 		{
-			AbstractSemaphoreNotifyAction _tmp2_ = 0;
+			AbstractSemaphoreNotifyAction _tmp2_;
 			GEnumValue* _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 			_tmp2_ = action;
@@ -389,7 +389,7 @@ void abstract_semaphore_wait (AbstractSemaphore* self) {
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	while (TRUE) {
 #line 392 "Semaphore.c"
-		AbstractSemaphoreWaitAction _tmp0_ = 0;
+		AbstractSemaphoreWaitAction _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp0_ = abstract_semaphore_do_wait (self);
 #line 69 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -429,7 +429,7 @@ AbstractSemaphoreWaitAction abstract_semaphore_do_wait (AbstractSemaphore* self)
 gboolean abstract_semaphore_reset (AbstractSemaphore* self) {
 	gboolean result = FALSE;
 	gboolean is_reset = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_val_if_fail (IS_ABSTRACT_SEMAPHORE (self), FALSE);
 #line 80 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -509,7 +509,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (collect_values[0].v_pointer) {
 #line 512 "Semaphore.c"
-		AbstractSemaphore* object;
+		AbstractSemaphore * object;
 		object = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -536,7 +536,7 @@ static gchar* value_abstract_semaphore_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_abstract_semaphore_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AbstractSemaphore** object_p;
+	AbstractSemaphore ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (!object_p) {
@@ -588,7 +588,7 @@ gpointer value_get_abstract_semaphore (const GValue* value) {
 
 
 void value_set_abstract_semaphore (GValue* value, gpointer v_object) {
-	AbstractSemaphore* old;
+	AbstractSemaphore * old;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -619,7 +619,7 @@ void value_set_abstract_semaphore (GValue* value, gpointer v_object) {
 
 
 void value_take_abstract_semaphore (GValue* value, gpointer v_object) {
-	AbstractSemaphore* old;
+	AbstractSemaphore * old;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ABSTRACT_SEMAPHORE));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -655,11 +655,11 @@ static void abstract_semaphore_class_init (AbstractSemaphoreClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (AbstractSemaphorePrivate));
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_notify;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) abstract_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) abstract_semaphore_real_do_wait;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) abstract_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) abstract_semaphore_real_do_reset;
 #line 664 "Semaphore.c"
 }
 
@@ -677,7 +677,7 @@ static void abstract_semaphore_instance_init (AbstractSemaphore * self) {
 }
 
 
-static void abstract_semaphore_finalize (AbstractSemaphore* obj) {
+static void abstract_semaphore_finalize (AbstractSemaphore * obj) {
 	AbstractSemaphore * self;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore);
@@ -706,7 +706,7 @@ GType abstract_semaphore_get_type (void) {
 
 
 gpointer abstract_semaphore_ref (gpointer instance) {
-	AbstractSemaphore* self;
+	AbstractSemaphore * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -717,7 +717,7 @@ gpointer abstract_semaphore_ref (gpointer instance) {
 
 
 void abstract_semaphore_unref (gpointer instance) {
-	AbstractSemaphore* self;
+	AbstractSemaphore * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -750,7 +750,7 @@ Semaphore* semaphore_new (void) {
 static AbstractSemaphoreNotifyAction semaphore_real_do_notify (AbstractSemaphore* base) {
 	Semaphore * self;
 	AbstractSemaphoreNotifyAction result = 0;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore);
 #line 102 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -777,7 +777,7 @@ static AbstractSemaphoreWaitAction semaphore_real_do_wait (AbstractSemaphore* ba
 	Semaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEMAPHORE, Semaphore);
 #line 111 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -808,9 +808,9 @@ static void semaphore_class_init (SemaphoreClass * klass) {
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (SemaphorePrivate));
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) semaphore_real_do_notify;
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) semaphore_real_do_wait;
 #line 815 "Semaphore.c"
 }
 
@@ -824,7 +824,7 @@ static void semaphore_instance_init (Semaphore * self) {
 }
 
 
-static void semaphore_finalize (AbstractSemaphore* obj) {
+static void semaphore_finalize (AbstractSemaphore * obj) {
 	Semaphore * self;
 #line 94 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEMAPHORE, Semaphore);
@@ -848,7 +848,7 @@ GType semaphore_get_type (void) {
 
 CountdownSemaphore* countdown_semaphore_construct (GType object_type, gint total) {
 	CountdownSemaphore* self = NULL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 120 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = (CountdownSemaphore*) abstract_semaphore_construct (object_type, ABSTRACT_SEMAPHORE_TYPE_BROADCAST);
 #line 122 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -871,12 +871,12 @@ CountdownSemaphore* countdown_semaphore_new (gint total) {
 static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (AbstractSemaphore* base) {
 	CountdownSemaphore * self;
 	AbstractSemaphoreNotifyAction result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	AbstractSemaphoreNotifyAction _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 125 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
 #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -886,8 +886,8 @@ static AbstractSemaphoreNotifyAction countdown_semaphore_real_do_notify (Abstrac
 #line 126 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	if (_tmp0_ >= _tmp1_) {
 #line 889 "Semaphore.c"
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
+		gint _tmp2_;
+		gint _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 		_tmp2_ = self->priv->passed;
 #line 127 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -926,8 +926,8 @@ static AbstractSemaphoreWaitAction countdown_semaphore_real_do_wait (AbstractSem
 	CountdownSemaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 132 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
 #line 133 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -960,9 +960,9 @@ static void countdown_semaphore_class_init (CountdownSemaphoreClass * klass) {
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (CountdownSemaphorePrivate));
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_notify;
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) countdown_semaphore_real_do_wait;
 #line 967 "Semaphore.c"
 }
 
@@ -976,7 +976,7 @@ static void countdown_semaphore_instance_init (CountdownSemaphore * self) {
 }
 
 
-static void countdown_semaphore_finalize (AbstractSemaphore* obj) {
+static void countdown_semaphore_finalize (AbstractSemaphore * obj) {
 	CountdownSemaphore * self;
 #line 115 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COUNTDOWN_SEMAPHORE, CountdownSemaphore);
@@ -1034,7 +1034,7 @@ static AbstractSemaphoreWaitAction event_semaphore_real_do_wait (AbstractSemapho
 	EventSemaphore * self;
 	AbstractSemaphoreWaitAction result = 0;
 	AbstractSemaphoreWaitAction _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SEMAPHORE, EventSemaphore);
 #line 151 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
@@ -1080,11 +1080,11 @@ static void event_semaphore_class_init (EventSemaphoreClass * klass) {
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	g_type_class_add_private (klass, sizeof (EventSemaphorePrivate));
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*)(AbstractSemaphore*)) event_semaphore_real_do_notify;
+	((AbstractSemaphoreClass *) klass)->do_notify = (AbstractSemaphoreNotifyAction (*) (AbstractSemaphore *)) event_semaphore_real_do_notify;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) event_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*) (AbstractSemaphore *)) event_semaphore_real_do_wait;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
-	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) event_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*) (AbstractSemaphore *)) event_semaphore_real_do_reset;
 #line 1089 "Semaphore.c"
 }
 
@@ -1098,7 +1098,7 @@ static void event_semaphore_instance_init (EventSemaphore * self) {
 }
 
 
-static void event_semaphore_finalize (AbstractSemaphore* obj) {
+static void event_semaphore_finalize (AbstractSemaphore * obj) {
 	EventSemaphore * self;
 #line 137 "/home/jens/Source/shotwell/src/threads/Semaphore.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SEMAPHORE, EventSemaphore);
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index b2cace8..04aae36 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.34.7, the Vala compiler
+/* Threads.c generated by valac 0.36.6, the Vala compiler
  * generated from Threads.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Workers.c b/src/threads/Workers.c
index ff9d180..0391730 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.34.7, the Vala compiler
+/* Workers.c generated by valac 0.36.6, the Vala compiler
  * generated from Workers.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -192,7 +192,7 @@ gint workers_get_pending_job_count (Workers* self);
 gboolean background_job_is_cancelled (BackgroundJob* self);
 void background_job_execute (BackgroundJob* self);
 void background_job_internal_notify_completion (BackgroundJob* self);
-static void workers_finalize (Workers* obj);
+static void workers_finalize (Workers * obj);
 
 
 static gint64 _background_job_priority_comparator_comparator (void* a, void* b, gpointer self) {
@@ -261,8 +261,8 @@ static void _workers_thread_start_gfunc (gpointer data, gpointer self) {
 Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive) {
 	Workers* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	guint _tmp1_ = 0U;
-	EventSemaphore* _tmp3_ = NULL;
+	guint _tmp1_;
+	EventSemaphore* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self = (Workers*) g_type_create_instance (object_type);
@@ -271,7 +271,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (_tmp1_ <= ((guint) 0)) {
 #line 274 "Workers.c"
-		guint _tmp2_ = 0U;
+		guint _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp2_ = max_threads;
 #line 24 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -295,10 +295,10 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 #line 296 "Workers.c"
 	{
 		GThreadPool* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		gboolean _tmp6_ = FALSE;
-		GThreadPool* _tmp7_ = NULL;
-		GThreadPool* _tmp8_ = NULL;
+		guint _tmp5_;
+		gboolean _tmp6_;
+		GThreadPool* _tmp7_;
+		GThreadPool* _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp5_ = max_threads;
 #line 31 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -338,7 +338,7 @@ Workers* workers_construct (GType object_type, guint max_threads, gboolean exclu
 	__catch8_g_thread_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp9_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		err = _inner_error_;
 #line 30 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -377,14 +377,14 @@ Workers* workers_new (guint max_threads, gboolean exclusive) {
 
 guint workers_threads_per_cpu (gint per, gint max) {
 	guint result = 0U;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	guint count = 0U;
-	guint _tmp1_ = 0U;
-	gint _tmp2_ = 0;
+	guint _tmp1_;
+	gint _tmp2_;
 	guint _tmp3_ = 0U;
-	gint _tmp4_ = 0;
-	guint _tmp9_ = 0U;
-	guint _tmp10_ = 0U;
+	gint _tmp4_;
+	guint _tmp9_;
+	guint _tmp10_;
 #line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_tmp0_ = per;
 #line 37 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -400,16 +400,16 @@ guint workers_threads_per_cpu (gint per, gint max) {
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (_tmp4_ < 0) {
 #line 403 "Workers.c"
-		guint _tmp5_ = 0U;
+		guint _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp5_ = count;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp3_ = _tmp5_;
 #line 409 "Workers.c"
 	} else {
-		guint _tmp6_ = 0U;
-		gint _tmp7_ = 0;
-		guint _tmp8_ = 0U;
+		guint _tmp6_;
+		gint _tmp7_;
+		guint _tmp8_;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp6_ = count;
 #line 40 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -434,10 +434,10 @@ guint workers_threads_per_cpu (gint per, gint max) {
 
 guint workers_thread_per_cpu_minus_one (void) {
 	guint result = 0U;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_tmp0_ = g_get_num_processors ();
 #line 46 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -471,7 +471,7 @@ static gint _background_job_priority_compare_func_gcompare_data_func (gconstpoin
 
 
 void workers_enqueue (Workers* self, BackgroundJob* job) {
-	EventSemaphore* _tmp0_ = NULL;
+	EventSemaphore* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
@@ -483,17 +483,17 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 	abstract_semaphore_reset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore));
 #line 485 "Workers.c"
 	{
-		GAsyncQueue* _tmp1_ = NULL;
+		GAsyncQueue* _tmp1_;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp1_ = self->priv->queue;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 492 "Workers.c"
 		{
-			GAsyncQueue* _tmp2_ = NULL;
-			BackgroundJob* _tmp3_ = NULL;
-			BackgroundJob* _tmp4_ = NULL;
-			gint _tmp5_ = 0;
+			GAsyncQueue* _tmp2_;
+			BackgroundJob* _tmp3_;
+			BackgroundJob* _tmp4_;
+			gint _tmp5_;
 #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp2_ = self->priv->queue;
 #line 55 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -510,7 +510,7 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 		}
 		__finally9:
 		{
-			GAsyncQueue* _tmp6_ = NULL;
+			GAsyncQueue* _tmp6_;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp6_ = self->priv->queue;
 #line 54 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -529,8 +529,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 		}
 	}
 	{
-		GThreadPool* _tmp7_ = NULL;
-		BackgroundJob* _tmp8_ = NULL;
+		GThreadPool* _tmp7_;
+		BackgroundJob* _tmp8_;
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp7_ = self->priv->thread_pool;
 #line 60 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -557,8 +557,8 @@ void workers_enqueue (Workers* self, BackgroundJob* job) {
 	__catch10_g_thread_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		err = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -595,8 +595,8 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 #line 596 "Workers.c"
 	{
 		GeeIterator* _job_it = NULL;
-		BackgroundJobBatch* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		BackgroundJobBatch* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = batch;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -606,12 +606,12 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		while (TRUE) {
 #line 609 "Workers.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			BackgroundJob* job = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			BackgroundJob* _tmp6_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			BackgroundJob* _tmp6_;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp2_ = _job_it;
 #line 69 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -644,7 +644,7 @@ void workers_enqueue_many (Workers* self, BackgroundJobBatch* batch) {
 
 
 void workers_wait_for_empty_queue (Workers* self) {
-	EventSemaphore* _tmp0_ = NULL;
+	EventSemaphore* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
 #line 74 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -662,7 +662,7 @@ gint workers_get_pending_job_count (Workers* self) {
 	g_return_val_if_fail (IS_WORKERS (self), 0);
 #line 664 "Workers.c"
 	{
-		GAsyncQueue* _tmp0_ = NULL;
+		GAsyncQueue* _tmp0_;
 		gint _tmp4_ = 0;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = self->priv->queue;
@@ -670,14 +670,14 @@ gint workers_get_pending_job_count (Workers* self) {
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 672 "Workers.c"
 		{
-			gint _tmp1_ = 0;
+			gint _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp1_ = self->priv->enqueued;
 #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			result = _tmp1_;
 #line 679 "Workers.c"
 			{
-				GAsyncQueue* _tmp2_ = NULL;
+				GAsyncQueue* _tmp2_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 				_tmp2_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -690,7 +690,7 @@ gint workers_get_pending_job_count (Workers* self) {
 		}
 		__finally11:
 		{
-			GAsyncQueue* _tmp3_ = NULL;
+			GAsyncQueue* _tmp3_;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp3_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -711,24 +711,24 @@ gint workers_get_pending_job_count (Workers* self) {
 static void workers_thread_start (Workers* self, void* ignored) {
 	BackgroundJob* job = NULL;
 	gboolean empty = FALSE;
-	gboolean _tmp7_ = FALSE;
+	gboolean _tmp7_;
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
 #line 719 "Workers.c"
 	{
-		GAsyncQueue* _tmp0_ = NULL;
+		GAsyncQueue* _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = self->priv->queue;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_rec_mutex_lock (&self->priv->__lock_queue);
 #line 726 "Workers.c"
 		{
-			GAsyncQueue* _tmp1_ = NULL;
-			gpointer _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
-			gint _tmp5_ = 0;
+			GAsyncQueue* _tmp1_;
+			gpointer _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
+			gint _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp1_ = self->priv->queue;
 #line 88 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -755,7 +755,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 		}
 		__finally12:
 		{
-			GAsyncQueue* _tmp6_ = NULL;
+			GAsyncQueue* _tmp6_;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			_tmp6_ = self->priv->queue;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -788,7 +788,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 #line 100 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (empty) {
 #line 791 "Workers.c"
-		EventSemaphore* _tmp8_ = NULL;
+		EventSemaphore* _tmp8_;
 #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp8_ = self->priv->empty_event;
 #line 101 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -843,7 +843,7 @@ static gchar* value_workers_collect_value (GValue* value, guint n_collect_values
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (collect_values[0].v_pointer) {
 #line 846 "Workers.c"
-		Workers* object;
+		Workers * object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -870,7 +870,7 @@ static gchar* value_workers_collect_value (GValue* value, guint n_collect_values
 
 
 static gchar* value_workers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Workers** object_p;
+	Workers ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (!object_p) {
@@ -922,7 +922,7 @@ gpointer value_get_workers (const GValue* value) {
 
 
 void value_set_workers (GValue* value, gpointer v_object) {
-	Workers* old;
+	Workers * old;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS));
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -953,7 +953,7 @@ void value_set_workers (GValue* value, gpointer v_object) {
 
 
 void value_take_workers (GValue* value, gpointer v_object) {
-	Workers* old;
+	Workers * old;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS));
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -993,8 +993,8 @@ static void workers_class_init (WorkersClass * klass) {
 
 
 static void workers_instance_init (Workers * self) {
-	GAsyncQueue* _tmp0_ = NULL;
-	EventSemaphore* _tmp1_ = NULL;
+	GAsyncQueue* _tmp0_;
+	EventSemaphore* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self->priv = WORKERS_GET_PRIVATE (self);
 #line 19 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -1015,7 +1015,7 @@ static void workers_instance_init (Workers * self) {
 }
 
 
-static void workers_finalize (Workers* obj) {
+static void workers_finalize (Workers * obj) {
 	Workers * self;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORKERS, Workers);
@@ -1048,7 +1048,7 @@ GType workers_get_type (void) {
 
 
 gpointer workers_ref (gpointer instance) {
-	Workers* self;
+	Workers * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1059,7 +1059,7 @@ gpointer workers_ref (gpointer instance) {
 
 
 void workers_unref (gpointer instance) {
-	Workers* self;
+	Workers * self;
 	self = instance;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {