Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 381 insertions, 376 deletions

diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index 2139827..7aa045d 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.34.7, the Vala compiler
+/* TimedQueue.c generated by valac 0.36.6, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -60,6 +60,11 @@ typedef struct _TimedQueueElementPrivate TimedQueueElementPrivate;
 #define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL)))
 typedef struct _TimedQueueParamSpecElement TimedQueueParamSpecElement;
 typedef struct _ParamSpecTimedQueue ParamSpecTimedQueue;
+enum  {
+	TIMED_QUEUE_PAUSED_SIGNAL,
+	TIMED_QUEUE_LAST_SIGNAL
+};
+static guint timed_queue_signals[TIMED_QUEUE_LAST_SIGNAL] = {0};
 
 #define TYPE_HASH_TIMED_QUEUE (hash_timed_queue_get_type ())
 #define HASH_TIMED_QUEUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HASH_TIMED_QUEUE, HashTimedQueue))
@@ -221,8 +226,8 @@ static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused);
 enum  {
 	TIMED_QUEUE_ELEMENT_DUMMY_PROPERTY
 };
-static void timed_queue_element_finalize (TimedQueueElement* obj);
-static void timed_queue_finalize (TimedQueue* obj);
+static void timed_queue_element_finalize (TimedQueueElement * obj);
+static void timed_queue_finalize (TimedQueue * obj);
 GType hash_timed_queue_get_type (void) G_GNUC_CONST;
 #define HASH_TIMED_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_HASH_TIMED_QUEUE, HashTimedQueuePrivate))
 enum  {
@@ -237,7 +242,7 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item);
 static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items);
 static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item);
-static void hash_timed_queue_finalize (TimedQueue* obj);
+static void hash_timed_queue_finalize (TimedQueue * obj);
 
 
 static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpointer self) {
@@ -245,7 +250,7 @@ static gint64 _timed_queue_element_comparator_comparator (void* a, void* b, gpoi
 	result = timed_queue_element_comparator (a, b);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 249 "TimedQueue.c"
+#line 254 "TimedQueue.c"
 }
 
 
@@ -254,22 +259,22 @@ static gboolean _timed_queue_on_heartbeat_gsource_func (gpointer self) {
 	result = timed_queue_on_heartbeat ((TimedQueue*) self);
 #line 66 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 258 "TimedQueue.c"
+#line 263 "TimedQueue.c"
 }
 
 
 TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 	TimedQueue* self = NULL;
-	guint _tmp0_ = 0U;
-	DequeuedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GeeEqualDataFunc _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint _tmp7_ = 0;
-	SortedList* _tmp8_ = NULL;
-	guint _tmp9_ = 0U;
-	gint _tmp10_ = 0;
-	guint _tmp11_ = 0U;
+	guint _tmp0_;
+	DequeuedCallback _tmp1_;
+	void* _tmp1__target;
+	GeeEqualDataFunc _tmp2_;
+	void* _tmp2__target;
+	gint _tmp7_;
+	SortedList* _tmp8_;
+	guint _tmp9_;
+	gint _tmp10_;
+	guint _tmp11_;
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = (TimedQueue*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -296,10 +301,10 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 	_tmp2__target = equal_func_target;
 #line 57 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp2_ != NULL) {
-#line 300 "TimedQueue.c"
-		GeeEqualDataFunc _tmp3_ = NULL;
-		void* _tmp3__target = NULL;
-		GDestroyNotify _tmp3__target_destroy_notify = NULL;
+#line 305 "TimedQueue.c"
+		GeeEqualDataFunc _tmp3_;
+		void* _tmp3__target;
+		GDestroyNotify _tmp3__target_destroy_notify;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = equal_func;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -326,11 +331,11 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 		self->priv->equal_func_target = _tmp3__target;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		self->priv->equal_func_target_destroy_notify = _tmp3__target_destroy_notify;
-#line 330 "TimedQueue.c"
+#line 335 "TimedQueue.c"
 	} else {
-		void* _tmp4_ = NULL;
-		GDestroyNotify _tmp5_ = NULL;
-		GeeEqualDataFunc _tmp6_ = NULL;
+		void* _tmp4_;
+		GDestroyNotify _tmp5_;
+		GeeEqualDataFunc _tmp6_;
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp6_ = gee_functions_get_equal_func_for (g_type, &_tmp4_, &_tmp5_);
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -347,7 +352,7 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 		self->priv->equal_func_target = _tmp4_;
 #line 60 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		self->priv->equal_func_target_destroy_notify = _tmp5_;
-#line 351 "TimedQueue.c"
+#line 356 "TimedQueue.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp7_ = priority;
@@ -377,20 +382,20 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 	equal_func_target_destroy_notify = NULL;
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 381 "TimedQueue.c"
+#line 386 "TimedQueue.c"
 }
 
 
 TimedQueue* timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 #line 52 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return timed_queue_construct (TYPE_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, equal_func, equal_func_target, equal_func_target_destroy_notify, priority);
-#line 388 "TimedQueue.c"
+#line 393 "TimedQueue.c"
 }
 
 
 guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	guint result = 0U;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0U);
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -399,18 +404,18 @@ guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	result = _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 403 "TimedQueue.c"
+#line 408 "TimedQueue.c"
 }
 
 
 void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
-	guint _tmp4_ = 0U;
-	guint _tmp5_ = 0U;
-	gint _tmp6_ = 0;
-	guint _tmp7_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	guint _tmp4_;
+	guint _tmp5_;
+	gint _tmp6_;
+	guint _tmp7_;
 #line 78 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 79 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -421,19 +426,19 @@ void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
 	if (_tmp0_ == _tmp1_) {
 #line 80 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 425 "TimedQueue.c"
+#line 430 "TimedQueue.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = self->priv->timer_id;
 #line 82 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 431 "TimedQueue.c"
-		guint _tmp3_ = 0U;
+#line 436 "TimedQueue.c"
+		guint _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = self->priv->timer_id;
 #line 83 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_source_remove (_tmp3_);
-#line 437 "TimedQueue.c"
+#line 442 "TimedQueue.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = msec;
@@ -447,35 +452,35 @@ void timed_queue_set_dequeue_spacing_msec (TimedQueue* self, guint msec) {
 	_tmp7_ = g_timeout_add_full (_tmp6_, _tmp5_, _timed_queue_on_heartbeat_gsource_func, timed_queue_ref (self), timed_queue_unref);
 #line 87 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->timer_id = _tmp7_;
-#line 451 "TimedQueue.c"
+#line 456 "TimedQueue.c"
 }
 
 
 static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	guint result = 0U;
 	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
-	guint _tmp4_ = 0U;
+	guint _tmp1_;
+	guint _tmp4_;
 #line 90 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0U);
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp1_ = self->priv->dequeue_spacing_msec;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 466 "TimedQueue.c"
-		guint _tmp2_ = 0U;
+#line 471 "TimedQueue.c"
+		guint _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = self->priv->hold_msec;
 #line 92 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = _tmp2_ / 10;
-#line 472 "TimedQueue.c"
+#line 477 "TimedQueue.c"
 	} else {
-		guint _tmp3_ = 0U;
+		guint _tmp3_;
 #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3_ = self->priv->dequeue_spacing_msec;
 #line 93 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = _tmp3_ / 2;
-#line 479 "TimedQueue.c"
+#line 484 "TimedQueue.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = CLAMP (_tmp0_, (guint) 10, G_MAXUINT);
@@ -483,14 +488,14 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 487 "TimedQueue.c"
+#line 492 "TimedQueue.c"
 }
 
 
 static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer item) {
-	DequeuedCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	gconstpointer _tmp1_ = NULL;
+	DequeuedCallback _tmp0_;
+	void* _tmp0__target;
+	gconstpointer _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->callback;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -499,7 +504,7 @@ static void timed_queue_real_notify_dequeued (TimedQueue* self, gconstpointer it
 	_tmp1_ = item;
 #line 97 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ (_tmp1_, _tmp0__target);
-#line 503 "TimedQueue.c"
+#line 508 "TimedQueue.c"
 }
 
 
@@ -508,13 +513,13 @@ void timed_queue_notify_dequeued (TimedQueue* self, gconstpointer item) {
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 96 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_GET_CLASS (self)->notify_dequeued (self, item);
-#line 512 "TimedQueue.c"
+#line 517 "TimedQueue.c"
 }
 
 
 gboolean timed_queue_is_paused (TimedQueue* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -523,12 +528,12 @@ gboolean timed_queue_is_paused (TimedQueue* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 527 "TimedQueue.c"
+#line 532 "TimedQueue.c"
 }
 
 
 void timed_queue_pause (TimedQueue* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 105 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -537,18 +542,18 @@ void timed_queue_pause (TimedQueue* self) {
 	if (_tmp0_) {
 #line 106 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 541 "TimedQueue.c"
+#line 546 "TimedQueue.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->paused_state = TRUE;
 #line 110 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_emit_by_name (self, "paused", TRUE);
-#line 547 "TimedQueue.c"
+	g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, TRUE);
+#line 552 "TimedQueue.c"
 }
 
 
 void timed_queue_unpause (TimedQueue* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 113 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 114 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -557,23 +562,23 @@ void timed_queue_unpause (TimedQueue* self) {
 	if (!_tmp0_) {
 #line 115 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 561 "TimedQueue.c"
+#line 566 "TimedQueue.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->paused_state = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_emit_by_name (self, "paused", FALSE);
-#line 567 "TimedQueue.c"
+	g_signal_emit (self, timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL], 0, FALSE);
+#line 572 "TimedQueue.c"
 }
 
 
 static void timed_queue_real_clear (TimedQueue* self) {
-	SortedList* _tmp0_ = NULL;
+	SortedList* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 123 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 577 "TimedQueue.c"
+#line 582 "TimedQueue.c"
 }
 
 
@@ -582,7 +587,7 @@ void timed_queue_clear (TimedQueue* self) {
 	g_return_if_fail (IS_TIMED_QUEUE (self));
 #line 122 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_GET_CLASS (self)->clear (self);
-#line 586 "TimedQueue.c"
+#line 591 "TimedQueue.c"
 }
 
 
@@ -590,8 +595,8 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 	gboolean result = FALSE;
 	{
 		GeeIterator* _e_it = NULL;
-		SortedList* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		SortedList* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp0_ = self->priv->queue;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -600,18 +605,18 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 		_e_it = _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 604 "TimedQueue.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 609 "TimedQueue.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			TimedQueueElement* e = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
-			GeeEqualDataFunc _tmp6_ = NULL;
-			void* _tmp6__target = NULL;
-			gconstpointer _tmp7_ = NULL;
-			TimedQueueElement* _tmp8_ = NULL;
-			gconstpointer _tmp9_ = NULL;
-			gboolean _tmp10_ = FALSE;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			GeeEqualDataFunc _tmp6_;
+			void* _tmp6__target;
+			gconstpointer _tmp7_;
+			TimedQueueElement* _tmp8_;
+			gconstpointer _tmp9_;
+			gboolean _tmp10_;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp2_ = _e_it;
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -620,7 +625,7 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 			if (!_tmp3_) {
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 624 "TimedQueue.c"
+#line 629 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _e_it;
@@ -650,21 +655,21 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 				_g_object_unref0 (_e_it);
 #line 129 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				return result;
-#line 654 "TimedQueue.c"
+#line 659 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (e);
-#line 658 "TimedQueue.c"
+#line 663 "TimedQueue.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_e_it);
-#line 662 "TimedQueue.c"
+#line 667 "TimedQueue.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
 #line 132 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 668 "TimedQueue.c"
+#line 673 "TimedQueue.c"
 }
 
 
@@ -673,19 +678,19 @@ gboolean timed_queue_contains (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 126 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->contains (self, item);
-#line 677 "TimedQueue.c"
+#line 682 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item) {
 	gboolean result = FALSE;
-	SortedList* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gulong _tmp2_ = 0UL;
-	TimedQueueElement* _tmp3_ = NULL;
-	TimedQueueElement* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	SortedList* _tmp0_;
+	gconstpointer _tmp1_;
+	gulong _tmp2_;
+	TimedQueueElement* _tmp3_;
+	TimedQueueElement* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -706,7 +711,7 @@ static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item)
 	result = _tmp6_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 710 "TimedQueue.c"
+#line 715 "TimedQueue.c"
 }
 
 
@@ -715,19 +720,19 @@ gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 135 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->enqueue (self, item);
-#line 719 "TimedQueue.c"
+#line 724 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection* items) {
 	gboolean result = FALSE;
 	gulong ready_time = 0UL;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 	GeeArrayList* elements = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	SortedList* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeArrayList* _tmp1_;
+	SortedList* _tmp13_;
+	GeeArrayList* _tmp14_;
+	gboolean _tmp15_;
 #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (items), FALSE);
 #line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -738,11 +743,11 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 	_tmp1_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, NULL, NULL, NULL);
 #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	elements = _tmp1_;
-#line 742 "TimedQueue.c"
+#line 747 "TimedQueue.c"
 	{
 		GeeIterator* _item_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = items;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -751,17 +756,17 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 		_item_it = _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 755 "TimedQueue.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 760 "TimedQueue.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gpointer item = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			GeeArrayList* _tmp8_ = NULL;
-			gconstpointer _tmp9_ = NULL;
-			gulong _tmp10_ = 0UL;
-			TimedQueueElement* _tmp11_ = NULL;
-			TimedQueueElement* _tmp12_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			GeeArrayList* _tmp8_;
+			gconstpointer _tmp9_;
+			gulong _tmp10_;
+			TimedQueueElement* _tmp11_;
+			TimedQueueElement* _tmp12_;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _item_it;
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -770,7 +775,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			if (!_tmp5_) {
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 774 "TimedQueue.c"
+#line 779 "TimedQueue.c"
 			}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -794,11 +799,11 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			_timed_queue_element_unref0 (_tmp12_);
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 798 "TimedQueue.c"
+#line 803 "TimedQueue.c"
 		}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 802 "TimedQueue.c"
+#line 807 "TimedQueue.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp13_ = self->priv->queue;
@@ -812,7 +817,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 	_g_object_unref0 (elements);
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 816 "TimedQueue.c"
+#line 821 "TimedQueue.c"
 }
 
 
@@ -821,15 +826,15 @@ gboolean timed_queue_enqueue_many (TimedQueue* self, GeeCollection* items) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 139 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->enqueue_many (self, items);
-#line 825 "TimedQueue.c"
+#line 830 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer item) {
 	gboolean result = FALSE;
 	GeeIterator* iter = NULL;
-	SortedList* _tmp0_ = NULL;
-	GeeIterator* _tmp1_ = NULL;
+	SortedList* _tmp0_;
+	GeeIterator* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = self->priv->queue;
 #line 150 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -838,18 +843,18 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 	iter = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	while (TRUE) {
-#line 842 "TimedQueue.c"
-		GeeIterator* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+#line 847 "TimedQueue.c"
+		GeeIterator* _tmp2_;
+		gboolean _tmp3_;
 		TimedQueueElement* e = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		gpointer _tmp5_ = NULL;
-		GeeEqualDataFunc _tmp6_ = NULL;
-		void* _tmp6__target = NULL;
-		gconstpointer _tmp7_ = NULL;
-		TimedQueueElement* _tmp8_ = NULL;
-		gconstpointer _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GeeIterator* _tmp4_;
+		gpointer _tmp5_;
+		GeeEqualDataFunc _tmp6_;
+		void* _tmp6__target;
+		gconstpointer _tmp7_;
+		TimedQueueElement* _tmp8_;
+		gconstpointer _tmp9_;
+		gboolean _tmp10_;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = iter;
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -858,7 +863,7 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 		if (!_tmp3_) {
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			break;
-#line 862 "TimedQueue.c"
+#line 867 "TimedQueue.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp4_ = iter;
@@ -880,8 +885,8 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 		_tmp10_ = _tmp6_ (_tmp7_, _tmp9_, _tmp6__target);
 #line 153 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (_tmp10_) {
-#line 884 "TimedQueue.c"
-			GeeIterator* _tmp11_ = NULL;
+#line 889 "TimedQueue.c"
+			GeeIterator* _tmp11_;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp11_ = iter;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -894,11 +899,11 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 			_g_object_unref0 (iter);
 #line 156 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return result;
-#line 898 "TimedQueue.c"
+#line 903 "TimedQueue.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_timed_queue_element_unref0 (e);
-#line 902 "TimedQueue.c"
+#line 907 "TimedQueue.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
@@ -906,7 +911,7 @@ static gboolean timed_queue_real_remove_first (TimedQueue* self, gconstpointer i
 	_g_object_unref0 (iter);
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 910 "TimedQueue.c"
+#line 915 "TimedQueue.c"
 }
 
 
@@ -915,14 +920,14 @@ gboolean timed_queue_remove_first (TimedQueue* self, gconstpointer item) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
 #line 149 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->remove_first (self, item);
-#line 919 "TimedQueue.c"
+#line 924 "TimedQueue.c"
 }
 
 
 static gulong timed_queue_calc_ready_time (TimedQueue* self) {
 	gulong result = 0UL;
-	gulong _tmp0_ = 0UL;
-	guint _tmp1_ = 0U;
+	gulong _tmp0_;
+	guint _tmp1_;
 #line 169 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0UL);
 #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -933,13 +938,13 @@ static gulong timed_queue_calc_ready_time (TimedQueue* self) {
 	result = _tmp0_ + ((gulong) _tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 937 "TimedQueue.c"
+#line 942 "TimedQueue.c"
 }
 
 
 static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gulong now = 0UL;
 #line 173 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), FALSE);
@@ -951,43 +956,43 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 		result = TRUE;
 #line 175 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 955 "TimedQueue.c"
+#line 960 "TimedQueue.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	now = (gulong) 0;
-#line 959 "TimedQueue.c"
+#line 964 "TimedQueue.c"
 	{
 		gboolean _tmp1_ = FALSE;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp1_ = TRUE;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 966 "TimedQueue.c"
-			SortedList* _tmp2_ = NULL;
-			gint _tmp3_ = 0;
-			gint _tmp4_ = 0;
+#line 971 "TimedQueue.c"
+			SortedList* _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
 			TimedQueueElement* head = NULL;
-			SortedList* _tmp5_ = NULL;
-			gpointer _tmp6_ = NULL;
-			TimedQueueElement* _tmp7_ = NULL;
-			gulong _tmp8_ = 0UL;
-			TimedQueueElement* _tmp10_ = NULL;
-			gulong _tmp11_ = 0UL;
-			gulong _tmp12_ = 0UL;
+			SortedList* _tmp5_;
+			gpointer _tmp6_;
+			TimedQueueElement* _tmp7_;
+			gulong _tmp8_;
+			TimedQueueElement* _tmp10_;
+			gulong _tmp11_;
+			gulong _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			guint _tmp14_ = 0U;
+			guint _tmp14_;
 			TimedQueueElement* h = NULL;
-			SortedList* _tmp18_ = NULL;
-			gpointer _tmp19_ = NULL;
-			TimedQueueElement* _tmp20_ = NULL;
-			TimedQueueElement* _tmp21_ = NULL;
-			TimedQueueElement* _tmp22_ = NULL;
-			gconstpointer _tmp23_ = NULL;
-			gulong _tmp24_ = 0UL;
-			guint _tmp25_ = 0U;
+			SortedList* _tmp18_;
+			gpointer _tmp19_;
+			TimedQueueElement* _tmp20_;
+			TimedQueueElement* _tmp21_;
+			TimedQueueElement* _tmp22_;
+			gconstpointer _tmp23_;
+			gulong _tmp24_;
+			guint _tmp25_;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (!_tmp1_) {
-#line 991 "TimedQueue.c"
+#line 996 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp1_ = FALSE;
@@ -1001,7 +1006,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			if (_tmp4_ == 0) {
 #line 181 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1005 "TimedQueue.c"
+#line 1010 "TimedQueue.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp5_ = self->priv->queue;
@@ -1017,13 +1022,13 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			_tmp8_ = now;
 #line 186 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp8_ == ((gulong) 0)) {
-#line 1021 "TimedQueue.c"
-				gulong _tmp9_ = 0UL;
+#line 1026 "TimedQueue.c"
+				gulong _tmp9_;
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp9_ = now_ms ();
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				now = _tmp9_;
-#line 1027 "TimedQueue.c"
+#line 1032 "TimedQueue.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = head;
@@ -1037,16 +1042,16 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1041 "TimedQueue.c"
+#line 1046 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp14_ = self->priv->dequeue_spacing_msec;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp14_ != ((guint) 0)) {
-#line 1047 "TimedQueue.c"
-				gulong _tmp15_ = 0UL;
-				gulong _tmp16_ = 0UL;
-				guint _tmp17_ = 0U;
+#line 1052 "TimedQueue.c"
+				gulong _tmp15_;
+				gulong _tmp16_;
+				guint _tmp17_;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp15_ = now;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1055,11 +1060,11 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_tmp17_ = self->priv->dequeue_spacing_msec;
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = (_tmp15_ - _tmp16_) < ((gulong) _tmp17_);
-#line 1059 "TimedQueue.c"
+#line 1064 "TimedQueue.c"
 			} else {
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = FALSE;
-#line 1063 "TimedQueue.c"
+#line 1068 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp13_) {
@@ -1067,7 +1072,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 194 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1071 "TimedQueue.c"
+#line 1076 "TimedQueue.c"
 			}
 #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp18_ = self->priv->queue;
@@ -1101,20 +1106,20 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 205 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1105 "TimedQueue.c"
+#line 1110 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (h);
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (head);
-#line 1111 "TimedQueue.c"
+#line 1116 "TimedQueue.c"
 		}
 	}
 #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = TRUE;
 #line 208 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1118 "TimedQueue.c"
+#line 1123 "TimedQueue.c"
 }
 
 
@@ -1123,16 +1128,16 @@ gint timed_queue_get_size (TimedQueue* self) {
 	g_return_val_if_fail (IS_TIMED_QUEUE (self), 0);
 #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return TIMED_QUEUE_GET_CLASS (self)->get_size (self);
-#line 1127 "TimedQueue.c"
+#line 1132 "TimedQueue.c"
 }
 
 
 static gint timed_queue_real_get_size (TimedQueue* base) {
 	gint result;
 	TimedQueue* self;
-	SortedList* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	SortedList* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 164 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = base;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1145,7 +1150,7 @@ static gint timed_queue_real_get_size (TimedQueue* base) {
 	result = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1149 "TimedQueue.c"
+#line 1154 "TimedQueue.c"
 }
 
 
@@ -1155,9 +1160,9 @@ static void timed_queue_real_paused (TimedQueue* self, gboolean is_paused) {
 
 static TimedQueueElement* timed_queue_element_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) {
 	TimedQueueElement* self = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
-	gulong _tmp2_ = 0UL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
+	gulong _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = (TimedQueueElement*) g_type_create_instance (object_type);
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1180,23 +1185,23 @@ static TimedQueueElement* timed_queue_element_construct (GType object_type, GTyp
 	self->ready = _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 1184 "TimedQueue.c"
+#line 1189 "TimedQueue.c"
 }
 
 
 static TimedQueueElement* timed_queue_element_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer item, gulong ready) {
 #line 26 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return timed_queue_element_construct (TIMED_QUEUE_TYPE_ELEMENT, g_type, g_dup_func, g_destroy_func, item, ready);
-#line 1191 "TimedQueue.c"
+#line 1196 "TimedQueue.c"
 }
 
 
 static gint64 timed_queue_element_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	gulong _tmp1_ = 0UL;
-	void* _tmp2_ = NULL;
-	gulong _tmp3_ = 0UL;
+	void* _tmp0_;
+	gulong _tmp1_;
+	void* _tmp2_;
+	gulong _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = a;
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1209,14 +1214,14 @@ static gint64 timed_queue_element_comparator (void* a, void* b) {
 	result = ((gint64) _tmp1_) - ((gint64) _tmp3_);
 #line 32 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1213 "TimedQueue.c"
+#line 1218 "TimedQueue.c"
 }
 
 
 static void timed_queue_value_element_init (GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	value->data[0].v_pointer = NULL;
-#line 1220 "TimedQueue.c"
+#line 1225 "TimedQueue.c"
 }
 
 
@@ -1225,7 +1230,7 @@ static void timed_queue_value_element_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (value->data[0].v_pointer);
-#line 1229 "TimedQueue.c"
+#line 1234 "TimedQueue.c"
 	}
 }
 
@@ -1235,11 +1240,11 @@ static void timed_queue_value_element_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = timed_queue_element_ref (src_value->data[0].v_pointer);
-#line 1239 "TimedQueue.c"
+#line 1244 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1243 "TimedQueue.c"
+#line 1248 "TimedQueue.c"
 	}
 }
 
@@ -1247,66 +1252,66 @@ static void timed_queue_value_element_copy_value (const GValue* src_value, GValu
 static gpointer timed_queue_value_element_peek_pointer (const GValue* value) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1251 "TimedQueue.c"
+#line 1256 "TimedQueue.c"
 }
 
 
 static gchar* timed_queue_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (collect_values[0].v_pointer) {
-#line 1258 "TimedQueue.c"
-		TimedQueueElement* object;
+#line 1263 "TimedQueue.c"
+		TimedQueueElement * object;
 		object = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1265 "TimedQueue.c"
+#line 1270 "TimedQueue.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1269 "TimedQueue.c"
+#line 1274 "TimedQueue.c"
 		}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_element_ref (object);
-#line 1273 "TimedQueue.c"
+#line 1278 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1277 "TimedQueue.c"
+#line 1282 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1281 "TimedQueue.c"
+#line 1286 "TimedQueue.c"
 }
 
 
 static gchar* timed_queue_value_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TimedQueueElement** object_p;
+	TimedQueueElement ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!object_p) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1292 "TimedQueue.c"
+#line 1297 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!value->data[0].v_pointer) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = NULL;
-#line 1298 "TimedQueue.c"
+#line 1303 "TimedQueue.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1302 "TimedQueue.c"
+#line 1307 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_element_ref (value->data[0].v_pointer);
-#line 1306 "TimedQueue.c"
+#line 1311 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1310 "TimedQueue.c"
+#line 1315 "TimedQueue.c"
 }
 
 
@@ -1320,7 +1325,7 @@ static GParamSpec* timed_queue_param_spec_element (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return G_PARAM_SPEC (spec);
-#line 1324 "TimedQueue.c"
+#line 1329 "TimedQueue.c"
 }
 
 
@@ -1329,12 +1334,12 @@ static gpointer timed_queue_value_get_element (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT), NULL);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1333 "TimedQueue.c"
+#line 1338 "TimedQueue.c"
 }
 
 
 static void timed_queue_value_set_element (GValue* value, gpointer v_object) {
-	TimedQueueElement* old;
+	TimedQueueElement * old;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1349,23 +1354,23 @@ static void timed_queue_value_set_element (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_ref (value->data[0].v_pointer);
-#line 1353 "TimedQueue.c"
+#line 1358 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1357 "TimedQueue.c"
+#line 1362 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (old);
-#line 1363 "TimedQueue.c"
+#line 1368 "TimedQueue.c"
 	}
 }
 
 
 static void timed_queue_value_take_element (GValue* value, gpointer v_object) {
-	TimedQueueElement* old;
+	TimedQueueElement * old;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TIMED_QUEUE_TYPE_ELEMENT));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1378,17 +1383,17 @@ static void timed_queue_value_take_element (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = v_object;
-#line 1382 "TimedQueue.c"
+#line 1387 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1386 "TimedQueue.c"
+#line 1391 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_element_unref (old);
-#line 1392 "TimedQueue.c"
+#line 1397 "TimedQueue.c"
 	}
 }
 
@@ -1400,7 +1405,7 @@ static void timed_queue_element_class_init (TimedQueueElementClass * klass) {
 	((TimedQueueElementClass *) klass)->finalize = timed_queue_element_finalize;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (TimedQueueElementPrivate));
-#line 1404 "TimedQueue.c"
+#line 1409 "TimedQueue.c"
 }
 
 
@@ -1409,11 +1414,11 @@ static void timed_queue_element_instance_init (TimedQueueElement * self) {
 	self->priv = TIMED_QUEUE_ELEMENT_GET_PRIVATE (self);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->ref_count = 1;
-#line 1413 "TimedQueue.c"
+#line 1418 "TimedQueue.c"
 }
 
 
-static void timed_queue_element_finalize (TimedQueueElement* obj) {
+static void timed_queue_element_finalize (TimedQueueElement * obj) {
 	TimedQueueElement * self;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TIMED_QUEUE_TYPE_ELEMENT, TimedQueueElement);
@@ -1421,7 +1426,7 @@ static void timed_queue_element_finalize (TimedQueueElement* obj) {
 	g_signal_handlers_destroy (self);
 #line 23 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	((self->item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (self->item = (self->priv->g_destroy_func (self->item), NULL));
-#line 1425 "TimedQueue.c"
+#line 1430 "TimedQueue.c"
 }
 
 
@@ -1440,18 +1445,18 @@ static GType timed_queue_element_get_type (void) {
 
 
 static gpointer timed_queue_element_ref (gpointer instance) {
-	TimedQueueElement* self;
+	TimedQueueElement * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1450 "TimedQueue.c"
+#line 1455 "TimedQueue.c"
 }
 
 
 static void timed_queue_element_unref (gpointer instance) {
-	TimedQueueElement* self;
+	TimedQueueElement * self;
 	self = instance;
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1459,7 +1464,7 @@ static void timed_queue_element_unref (gpointer instance) {
 		TIMED_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1463 "TimedQueue.c"
+#line 1468 "TimedQueue.c"
 	}
 }
 
@@ -1467,7 +1472,7 @@ static void timed_queue_element_unref (gpointer instance) {
 static void value_timed_queue_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	value->data[0].v_pointer = NULL;
-#line 1471 "TimedQueue.c"
+#line 1476 "TimedQueue.c"
 }
 
 
@@ -1476,7 +1481,7 @@ static void value_timed_queue_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (value->data[0].v_pointer);
-#line 1480 "TimedQueue.c"
+#line 1485 "TimedQueue.c"
 	}
 }
 
@@ -1486,11 +1491,11 @@ static void value_timed_queue_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = timed_queue_ref (src_value->data[0].v_pointer);
-#line 1490 "TimedQueue.c"
+#line 1495 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1494 "TimedQueue.c"
+#line 1499 "TimedQueue.c"
 	}
 }
 
@@ -1498,66 +1503,66 @@ static void value_timed_queue_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_timed_queue_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1502 "TimedQueue.c"
+#line 1507 "TimedQueue.c"
 }
 
 
 static gchar* value_timed_queue_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (collect_values[0].v_pointer) {
-#line 1509 "TimedQueue.c"
-		TimedQueue* object;
+#line 1514 "TimedQueue.c"
+		TimedQueue * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1516 "TimedQueue.c"
+#line 1521 "TimedQueue.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1520 "TimedQueue.c"
+#line 1525 "TimedQueue.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_ref (object);
-#line 1524 "TimedQueue.c"
+#line 1529 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1528 "TimedQueue.c"
+#line 1533 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1532 "TimedQueue.c"
+#line 1537 "TimedQueue.c"
 }
 
 
 static gchar* value_timed_queue_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	TimedQueue** object_p;
+	TimedQueue ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1543 "TimedQueue.c"
+#line 1548 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = NULL;
-#line 1549 "TimedQueue.c"
+#line 1554 "TimedQueue.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1553 "TimedQueue.c"
+#line 1558 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_ref (value->data[0].v_pointer);
-#line 1557 "TimedQueue.c"
+#line 1562 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1561 "TimedQueue.c"
+#line 1566 "TimedQueue.c"
 }
 
 
@@ -1571,7 +1576,7 @@ GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return G_PARAM_SPEC (spec);
-#line 1575 "TimedQueue.c"
+#line 1580 "TimedQueue.c"
 }
 
 
@@ -1580,12 +1585,12 @@ gpointer value_get_timed_queue (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE), NULL);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return value->data[0].v_pointer;
-#line 1584 "TimedQueue.c"
+#line 1589 "TimedQueue.c"
 }
 
 
 void value_set_timed_queue (GValue* value, gpointer v_object) {
-	TimedQueue* old;
+	TimedQueue * old;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1600,23 +1605,23 @@ void value_set_timed_queue (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_ref (value->data[0].v_pointer);
-#line 1604 "TimedQueue.c"
+#line 1609 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1608 "TimedQueue.c"
+#line 1613 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (old);
-#line 1614 "TimedQueue.c"
+#line 1619 "TimedQueue.c"
 	}
 }
 
 
 void value_take_timed_queue (GValue* value, gpointer v_object) {
-	TimedQueue* old;
+	TimedQueue * old;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TIMED_QUEUE));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1629,17 +1634,17 @@ void value_take_timed_queue (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = v_object;
-#line 1633 "TimedQueue.c"
+#line 1638 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1637 "TimedQueue.c"
+#line 1642 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		timed_queue_unref (old);
-#line 1643 "TimedQueue.c"
+#line 1648 "TimedQueue.c"
 	}
 }
 
@@ -1652,24 +1657,24 @@ static void timed_queue_class_init (TimedQueueClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (TimedQueuePrivate));
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->notify_dequeued = (void (*)(TimedQueue*, gconstpointer)) timed_queue_real_notify_dequeued;
+	((TimedQueueClass *) klass)->notify_dequeued = (void (*) (TimedQueue *, gconstpointer)) timed_queue_real_notify_dequeued;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->clear = (void (*)(TimedQueue*)) timed_queue_real_clear;
+	((TimedQueueClass *) klass)->clear = (void (*) (TimedQueue *)) timed_queue_real_clear;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->contains = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_contains;
+	((TimedQueueClass *) klass)->contains = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_contains;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_enqueue;
+	((TimedQueueClass *) klass)->enqueue = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_enqueue;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*)(TimedQueue*, GeeCollection*)) timed_queue_real_enqueue_many;
+	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*) (TimedQueue *, GeeCollection*)) timed_queue_real_enqueue_many;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) timed_queue_real_remove_first;
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*) (TimedQueue *, gconstpointer)) timed_queue_real_remove_first;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	((TimedQueueClass *) klass)->paused = timed_queue_real_paused;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (klass)->get_size = timed_queue_real_get_size;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	g_signal_new ("paused", TYPE_TIMED_QUEUE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (TimedQueueClass, paused), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1673 "TimedQueue.c"
+	timed_queue_signals[TIMED_QUEUE_PAUSED_SIGNAL] = g_signal_new ("paused", TYPE_TIMED_QUEUE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (TimedQueueClass, paused), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1678 "TimedQueue.c"
 }
 
 
@@ -1686,13 +1691,13 @@ static void timed_queue_instance_init (TimedQueue * self) {
 	self->priv->paused_state = FALSE;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->ref_count = 1;
-#line 1690 "TimedQueue.c"
+#line 1695 "TimedQueue.c"
 }
 
 
-static void timed_queue_finalize (TimedQueue* obj) {
+static void timed_queue_finalize (TimedQueue * obj) {
 	TimedQueue * self;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TIMED_QUEUE, TimedQueue);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1701,13 +1706,13 @@ static void timed_queue_finalize (TimedQueue* obj) {
 	_tmp0_ = self->priv->timer_id;
 #line 70 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 1705 "TimedQueue.c"
-		guint _tmp1_ = 0U;
+#line 1710 "TimedQueue.c"
+		guint _tmp1_;
 #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp1_ = self->priv->timer_id;
 #line 71 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_source_remove (_tmp1_);
-#line 1711 "TimedQueue.c"
+#line 1716 "TimedQueue.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	(self->priv->equal_func_target_destroy_notify == NULL) ? NULL : (self->priv->equal_func_target_destroy_notify (self->priv->equal_func_target), NULL);
@@ -1719,7 +1724,7 @@ static void timed_queue_finalize (TimedQueue* obj) {
 	self->priv->equal_func_target_destroy_notify = NULL;
 #line 41 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->queue);
-#line 1723 "TimedQueue.c"
+#line 1728 "TimedQueue.c"
 }
 
 
@@ -1738,18 +1743,18 @@ GType timed_queue_get_type (void) {
 
 
 gpointer timed_queue_ref (gpointer instance) {
-	TimedQueue* self;
+	TimedQueue * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1748 "TimedQueue.c"
+#line 1753 "TimedQueue.c"
 }
 
 
 void timed_queue_unref (gpointer instance) {
-	TimedQueue* self;
+	TimedQueue * self;
 	self = instance;
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1757,27 +1762,27 @@ void timed_queue_unref (gpointer instance) {
 		TIMED_QUEUE_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1761 "TimedQueue.c"
+#line 1766 "TimedQueue.c"
 	}
 }
 
 
 HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 	HashTimedQueue* self = NULL;
-	guint _tmp0_ = 0U;
-	DequeuedCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	GeeEqualDataFunc _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	GDestroyNotify _tmp2__target_destroy_notify = NULL;
-	gint _tmp3_ = 0;
-	GeeHashDataFunc _tmp4_ = NULL;
-	void* _tmp4__target = NULL;
-	GDestroyNotify _tmp4__target_destroy_notify = NULL;
-	GeeEqualDataFunc _tmp5_ = NULL;
-	void* _tmp5__target = NULL;
-	GDestroyNotify _tmp5__target_destroy_notify = NULL;
-	GeeHashMap* _tmp6_ = NULL;
+	guint _tmp0_;
+	DequeuedCallback _tmp1_;
+	void* _tmp1__target;
+	GeeEqualDataFunc _tmp2_;
+	void* _tmp2__target;
+	GDestroyNotify _tmp2__target_destroy_notify;
+	gint _tmp3_;
+	GeeHashDataFunc _tmp4_;
+	void* _tmp4__target;
+	GDestroyNotify _tmp4__target_destroy_notify;
+	GeeEqualDataFunc _tmp5_;
+	void* _tmp5__target;
+	GDestroyNotify _tmp5__target_destroy_notify;
+	GeeHashMap* _tmp6_;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp0_ = hold_msec;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1854,21 +1859,21 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 	equal_func_target_destroy_notify = NULL;
 #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return self;
-#line 1858 "TimedQueue.c"
+#line 1863 "TimedQueue.c"
 }
 
 
 HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority) {
 #line 217 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return hash_timed_queue_construct (TYPE_HASH_TIMED_QUEUE, g_type, g_dup_func, g_destroy_func, hold_msec, callback, callback_target, hash_func, hash_func_target, hash_func_target_destroy_notify, equal_func, equal_func_target, equal_func_target_destroy_notify, priority);
-#line 1865 "TimedQueue.c"
+#line 1870 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 226 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1879,13 +1884,13 @@ static void hash_timed_queue_real_notify_dequeued (TimedQueue* base, gconstpoint
 	_tmp1_ = item;
 #line 228 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->notify_dequeued (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue), _tmp1_);
-#line 1883 "TimedQueue.c"
+#line 1888 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_real_clear (TimedQueue* base) {
 	HashTimedQueue * self;
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 232 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1894,16 +1899,16 @@ static void hash_timed_queue_real_clear (TimedQueue* base) {
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 234 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->clear (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TIMED_QUEUE, TimedQueue));
-#line 1898 "TimedQueue.c"
+#line 1903 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	GeeHashMap* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 #line 237 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1916,21 +1921,21 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 	result = _tmp2_;
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1920 "TimedQueue.c"
+#line 1925 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	gconstpointer _tmp0_;
+	gboolean _tmp1_;
 	gint _tmp2_ = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	GeeHashMap* _tmp9_ = NULL;
-	gconstpointer _tmp10_ = NULL;
+	GeeHashMap* _tmp3_;
+	gconstpointer _tmp4_;
+	gboolean _tmp5_;
+	GeeHashMap* _tmp9_;
+	gconstpointer _tmp10_;
 #line 241 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 242 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1943,7 +1948,7 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 		result = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 1947 "TimedQueue.c"
+#line 1952 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -1953,10 +1958,10 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp5_) {
-#line 1957 "TimedQueue.c"
-		GeeHashMap* _tmp6_ = NULL;
-		gconstpointer _tmp7_ = NULL;
-		gpointer _tmp8_ = NULL;
+#line 1962 "TimedQueue.c"
+		GeeHashMap* _tmp6_;
+		gconstpointer _tmp7_;
+		gpointer _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp6_ = self->priv->item_count;
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1965,11 +1970,11 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 		_tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = ((gint) ((gintptr) _tmp8_)) + 1;
-#line 1969 "TimedQueue.c"
+#line 1974 "TimedQueue.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = 1;
-#line 1973 "TimedQueue.c"
+#line 1978 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp9_ = self->priv->item_count;
@@ -1981,15 +1986,15 @@ static gboolean hash_timed_queue_real_enqueue (TimedQueue* base, gconstpointer i
 	result = TRUE;
 #line 247 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1985 "TimedQueue.c"
+#line 1990 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollection* items) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	GeeCollection* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GeeCollection* _tmp0_;
+	gboolean _tmp1_;
 #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 250 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2004,12 +2009,12 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 		result = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 2008 "TimedQueue.c"
+#line 2013 "TimedQueue.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = items;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2018,18 +2023,18 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 		_item_it = _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		while (TRUE) {
-#line 2022 "TimedQueue.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+#line 2027 "TimedQueue.c"
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gpointer item = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			gint _tmp8_ = 0;
-			GeeHashMap* _tmp9_ = NULL;
-			gconstpointer _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
-			GeeHashMap* _tmp15_ = NULL;
-			gconstpointer _tmp16_ = NULL;
+			GeeHashMap* _tmp9_;
+			gconstpointer _tmp10_;
+			gboolean _tmp11_;
+			GeeHashMap* _tmp15_;
+			gconstpointer _tmp16_;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _item_it;
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2038,7 +2043,7 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			if (!_tmp5_) {
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 2042 "TimedQueue.c"
+#line 2047 "TimedQueue.c"
 			}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -2054,10 +2059,10 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			_tmp11_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_);
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp11_) {
-#line 2058 "TimedQueue.c"
-				GeeHashMap* _tmp12_ = NULL;
-				gconstpointer _tmp13_ = NULL;
-				gpointer _tmp14_ = NULL;
+#line 2063 "TimedQueue.c"
+				GeeHashMap* _tmp12_;
+				gconstpointer _tmp13_;
+				gpointer _tmp14_;
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp12_ = self->priv->item_count;
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2066,11 +2071,11 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 				_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = ((gint) ((gintptr) _tmp14_)) + 1;
-#line 2070 "TimedQueue.c"
+#line 2075 "TimedQueue.c"
 			} else {
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = 1;
-#line 2074 "TimedQueue.c"
+#line 2079 "TimedQueue.c"
 			}
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp15_ = self->priv->item_count;
@@ -2080,26 +2085,26 @@ static gboolean hash_timed_queue_real_enqueue_many (TimedQueue* base, GeeCollect
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp8_));
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 2084 "TimedQueue.c"
+#line 2089 "TimedQueue.c"
 		}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 2088 "TimedQueue.c"
+#line 2093 "TimedQueue.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = TRUE;
 #line 257 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 2094 "TimedQueue.c"
+#line 2099 "TimedQueue.c"
 }
 
 
 static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpointer item) {
 	HashTimedQueue * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gconstpointer _tmp2_ = NULL;
+	gconstpointer _tmp0_;
+	gboolean _tmp1_;
+	gconstpointer _tmp2_;
 #line 260 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
 #line 261 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2112,7 +2117,7 @@ static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpoin
 		result = FALSE;
 #line 262 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 2116 "TimedQueue.c"
+#line 2121 "TimedQueue.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = item;
@@ -2122,21 +2127,21 @@ static gboolean hash_timed_queue_real_remove_first (TimedQueue* base, gconstpoin
 	result = TRUE;
 #line 266 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 2126 "TimedQueue.c"
+#line 2131 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item) {
-	GeeHashMap* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GeeHashMap* _tmp0_;
+	gconstpointer _tmp1_;
+	gboolean _tmp2_;
 	gint count = 0;
-	GeeHashMap* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
+	GeeHashMap* _tmp3_;
+	gconstpointer _tmp4_;
+	gpointer _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
 #line 269 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_return_if_fail (IS_HASH_TIMED_QUEUE (self));
 #line 272 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2149,7 +2154,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	if (!_tmp2_) {
 #line 273 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 2153 "TimedQueue.c"
+#line 2158 "TimedQueue.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -2171,20 +2176,20 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	_tmp8_ = count;
 #line 278 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp8_ == 0) {
-#line 2175 "TimedQueue.c"
-		GeeHashMap* _tmp9_ = NULL;
-		gconstpointer _tmp10_ = NULL;
+#line 2180 "TimedQueue.c"
+		GeeHashMap* _tmp9_;
+		gconstpointer _tmp10_;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp9_ = self->priv->item_count;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp10_ = item;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_, NULL);
-#line 2184 "TimedQueue.c"
+#line 2189 "TimedQueue.c"
 	} else {
-		GeeHashMap* _tmp11_ = NULL;
-		gconstpointer _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		GeeHashMap* _tmp11_;
+		gconstpointer _tmp12_;
+		gint _tmp13_;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp11_ = self->priv->item_count;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2193,7 +2198,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 		_tmp13_ = count;
 #line 281 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, (gpointer) ((gintptr) _tmp13_));
-#line 2197 "TimedQueue.c"
+#line 2202 "TimedQueue.c"
 	}
 }
 
@@ -2206,29 +2211,29 @@ static void hash_timed_queue_class_init (HashTimedQueueClass * klass) {
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	g_type_class_add_private (klass, sizeof (HashTimedQueuePrivate));
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->notify_dequeued = (void (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_notify_dequeued;
+	((TimedQueueClass *) klass)->notify_dequeued = (void (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_notify_dequeued;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->clear = (void (*)(TimedQueue*)) hash_timed_queue_real_clear;
+	((TimedQueueClass *) klass)->clear = (void (*) (TimedQueue *)) hash_timed_queue_real_clear;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->contains = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_contains;
+	((TimedQueueClass *) klass)->contains = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_contains;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_enqueue;
+	((TimedQueueClass *) klass)->enqueue = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_enqueue;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*)(TimedQueue*, GeeCollection*)) hash_timed_queue_real_enqueue_many;
+	((TimedQueueClass *) klass)->enqueue_many = (gboolean (*) (TimedQueue *, GeeCollection*)) hash_timed_queue_real_enqueue_many;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_remove_first;
-#line 2221 "TimedQueue.c"
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*) (TimedQueue *, gconstpointer)) hash_timed_queue_real_remove_first;
+#line 2226 "TimedQueue.c"
 }
 
 
 static void hash_timed_queue_instance_init (HashTimedQueue * self) {
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv = HASH_TIMED_QUEUE_GET_PRIVATE (self);
-#line 2228 "TimedQueue.c"
+#line 2233 "TimedQueue.c"
 }
 
 
-static void hash_timed_queue_finalize (TimedQueue* obj) {
+static void hash_timed_queue_finalize (TimedQueue * obj) {
 	HashTimedQueue * self;
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HASH_TIMED_QUEUE, HashTimedQueue);
@@ -2236,7 +2241,7 @@ static void hash_timed_queue_finalize (TimedQueue* obj) {
 	_g_object_unref0 (self->priv->item_count);
 #line 214 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	TIMED_QUEUE_CLASS (hash_timed_queue_parent_class)->finalize (obj);
-#line 2240 "TimedQueue.c"
+#line 2245 "TimedQueue.c"
 }