New upstream version 0.26.1upstream/0.26.1

1 files changed, 189 insertions, 173 deletions

diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index b2ba07c..2139827 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.34.4, the Vala compiler
+/* TimedQueue.c generated by valac 0.34.7, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -307,6 +307,10 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3__target_destroy_notify = equal_func_target_destroy_notify;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+		equal_func = NULL;
+#line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+		equal_func_target = NULL;
+#line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		equal_func_target_destroy_notify = NULL;
 #line 58 "/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);
@@ -322,7 +326,7 @@ 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 326 "TimedQueue.c"
+#line 330 "TimedQueue.c"
 	} else {
 		void* _tmp4_ = NULL;
 		GDestroyNotify _tmp5_ = NULL;
@@ -343,14 +347,14 @@ 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 347 "TimedQueue.c"
+#line 351 "TimedQueue.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp7_ = priority;
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->priority = _tmp7_;
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp8_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL);
+	_tmp8_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->queue);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -373,14 +377,14 @@ 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 377 "TimedQueue.c"
+#line 381 "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 384 "TimedQueue.c"
+#line 388 "TimedQueue.c"
 }
 
 
@@ -395,7 +399,7 @@ guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	result = _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 399 "TimedQueue.c"
+#line 403 "TimedQueue.c"
 }
 
 
@@ -417,19 +421,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 421 "TimedQueue.c"
+#line 425 "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 427 "TimedQueue.c"
+#line 431 "TimedQueue.c"
 		guint _tmp3_ = 0U;
 #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 433 "TimedQueue.c"
+#line 437 "TimedQueue.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = msec;
@@ -443,7 +447,7 @@ 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 447 "TimedQueue.c"
+#line 451 "TimedQueue.c"
 }
 
 
@@ -458,20 +462,20 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	_tmp1_ = self->priv->dequeue_spacing_msec;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 462 "TimedQueue.c"
+#line 466 "TimedQueue.c"
 		guint _tmp2_ = 0U;
 #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 468 "TimedQueue.c"
+#line 472 "TimedQueue.c"
 	} else {
 		guint _tmp3_ = 0U;
 #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 475 "TimedQueue.c"
+#line 479 "TimedQueue.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = CLAMP (_tmp0_, (guint) 10, G_MAXUINT);
@@ -479,7 +483,7 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 483 "TimedQueue.c"
+#line 487 "TimedQueue.c"
 }
 
 
@@ -495,7 +499,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 499 "TimedQueue.c"
+#line 503 "TimedQueue.c"
 }
 
 
@@ -504,7 +508,7 @@ 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 508 "TimedQueue.c"
+#line 512 "TimedQueue.c"
 }
 
 
@@ -519,7 +523,7 @@ gboolean timed_queue_is_paused (TimedQueue* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 523 "TimedQueue.c"
+#line 527 "TimedQueue.c"
 }
 
 
@@ -533,13 +537,13 @@ void timed_queue_pause (TimedQueue* self) {
 	if (_tmp0_) {
 #line 106 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 537 "TimedQueue.c"
+#line 541 "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 543 "TimedQueue.c"
+#line 547 "TimedQueue.c"
 }
 
 
@@ -553,13 +557,13 @@ void timed_queue_unpause (TimedQueue* self) {
 	if (!_tmp0_) {
 #line 115 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 557 "TimedQueue.c"
+#line 561 "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 563 "TimedQueue.c"
+#line 567 "TimedQueue.c"
 }
 
 
@@ -569,7 +573,7 @@ static void timed_queue_real_clear (TimedQueue* self) {
 	_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 573 "TimedQueue.c"
+#line 577 "TimedQueue.c"
 }
 
 
@@ -578,7 +582,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 582 "TimedQueue.c"
+#line 586 "TimedQueue.c"
 }
 
 
@@ -596,7 +600,7 @@ 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 600 "TimedQueue.c"
+#line 604 "TimedQueue.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			TimedQueueElement* e = NULL;
@@ -616,7 +620,7 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 			if (!_tmp3_) {
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 620 "TimedQueue.c"
+#line 624 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _e_it;
@@ -646,21 +650,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 650 "TimedQueue.c"
+#line 654 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (e);
-#line 654 "TimedQueue.c"
+#line 658 "TimedQueue.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_e_it);
-#line 658 "TimedQueue.c"
+#line 662 "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 664 "TimedQueue.c"
+#line 668 "TimedQueue.c"
 }
 
 
@@ -669,7 +673,7 @@ 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 673 "TimedQueue.c"
+#line 677 "TimedQueue.c"
 }
 
 
@@ -689,7 +693,7 @@ static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item)
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = timed_queue_calc_ready_time (self);
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp3_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp1_, _tmp2_);
+	_tmp3_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp1_, _tmp2_);
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = _tmp3_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -702,7 +706,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 706 "TimedQueue.c"
+#line 710 "TimedQueue.c"
 }
 
 
@@ -711,7 +715,7 @@ 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 715 "TimedQueue.c"
+#line 719 "TimedQueue.c"
 }
 
 
@@ -731,10 +735,10 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 #line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	ready_time = _tmp0_;
 #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp1_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, timed_queue_element_unref, NULL, NULL, NULL);
+	_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 738 "TimedQueue.c"
+#line 742 "TimedQueue.c"
 	{
 		GeeIterator* _item_it = NULL;
 		GeeCollection* _tmp2_ = NULL;
@@ -747,7 +751,7 @@ 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 751 "TimedQueue.c"
+#line 755 "TimedQueue.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			gpointer item = NULL;
@@ -766,7 +770,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			if (!_tmp5_) {
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 770 "TimedQueue.c"
+#line 774 "TimedQueue.c"
 			}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -781,7 +785,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = ready_time;
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-			_tmp11_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp9_, _tmp10_);
+			_tmp11_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp9_, _tmp10_);
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp12_ = _tmp11_;
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -790,11 +794,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 794 "TimedQueue.c"
+#line 798 "TimedQueue.c"
 		}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 798 "TimedQueue.c"
+#line 802 "TimedQueue.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp13_ = self->priv->queue;
@@ -808,7 +812,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 812 "TimedQueue.c"
+#line 816 "TimedQueue.c"
 }
 
 
@@ -817,7 +821,7 @@ 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 821 "TimedQueue.c"
+#line 825 "TimedQueue.c"
 }
 
 
@@ -834,7 +838,7 @@ 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 838 "TimedQueue.c"
+#line 842 "TimedQueue.c"
 		GeeIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		TimedQueueElement* e = NULL;
@@ -854,7 +858,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 858 "TimedQueue.c"
+#line 862 "TimedQueue.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp4_ = iter;
@@ -876,7 +880,7 @@ 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 880 "TimedQueue.c"
+#line 884 "TimedQueue.c"
 			GeeIterator* _tmp11_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp11_ = iter;
@@ -890,11 +894,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 894 "TimedQueue.c"
+#line 898 "TimedQueue.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_timed_queue_element_unref0 (e);
-#line 898 "TimedQueue.c"
+#line 902 "TimedQueue.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
@@ -902,7 +906,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 906 "TimedQueue.c"
+#line 910 "TimedQueue.c"
 }
 
 
@@ -911,7 +915,7 @@ 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 915 "TimedQueue.c"
+#line 919 "TimedQueue.c"
 }
 
 
@@ -929,7 +933,7 @@ 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 933 "TimedQueue.c"
+#line 937 "TimedQueue.c"
 }
 
 
@@ -947,18 +951,18 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 		result = TRUE;
 #line 175 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 951 "TimedQueue.c"
+#line 955 "TimedQueue.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	now = (gulong) 0;
-#line 955 "TimedQueue.c"
+#line 959 "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 962 "TimedQueue.c"
+#line 966 "TimedQueue.c"
 			SortedList* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -983,7 +987,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			guint _tmp25_ = 0U;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (!_tmp1_) {
-#line 987 "TimedQueue.c"
+#line 991 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp1_ = FALSE;
@@ -997,7 +1001,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			if (_tmp4_ == 0) {
 #line 181 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1001 "TimedQueue.c"
+#line 1005 "TimedQueue.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp5_ = self->priv->queue;
@@ -1013,13 +1017,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 1017 "TimedQueue.c"
+#line 1021 "TimedQueue.c"
 				gulong _tmp9_ = 0UL;
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp9_ = now_ms ();
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				now = _tmp9_;
-#line 1023 "TimedQueue.c"
+#line 1027 "TimedQueue.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = head;
@@ -1033,13 +1037,13 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1037 "TimedQueue.c"
+#line 1041 "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 1043 "TimedQueue.c"
+#line 1047 "TimedQueue.c"
 				gulong _tmp15_ = 0UL;
 				gulong _tmp16_ = 0UL;
 				guint _tmp17_ = 0U;
@@ -1051,11 +1055,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 1055 "TimedQueue.c"
+#line 1059 "TimedQueue.c"
 			} else {
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = FALSE;
-#line 1059 "TimedQueue.c"
+#line 1063 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp13_) {
@@ -1063,7 +1067,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 1067 "TimedQueue.c"
+#line 1071 "TimedQueue.c"
 			}
 #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp18_ = self->priv->queue;
@@ -1097,20 +1101,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 1101 "TimedQueue.c"
+#line 1105 "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 1107 "TimedQueue.c"
+#line 1111 "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 1114 "TimedQueue.c"
+#line 1118 "TimedQueue.c"
 }
 
 
@@ -1119,7 +1123,7 @@ 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 1123 "TimedQueue.c"
+#line 1127 "TimedQueue.c"
 }
 
 
@@ -1141,7 +1145,7 @@ static gint timed_queue_real_get_size (TimedQueue* base) {
 	result = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1145 "TimedQueue.c"
+#line 1149 "TimedQueue.c"
 }
 
 
@@ -1176,14 +1180,14 @@ 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 1180 "TimedQueue.c"
+#line 1184 "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 1187 "TimedQueue.c"
+#line 1191 "TimedQueue.c"
 }
 
 
@@ -1205,14 +1209,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 1209 "TimedQueue.c"
+#line 1213 "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 1216 "TimedQueue.c"
+#line 1220 "TimedQueue.c"
 }
 
 
@@ -1221,7 +1225,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 1225 "TimedQueue.c"
+#line 1229 "TimedQueue.c"
 	}
 }
 
@@ -1231,11 +1235,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 1235 "TimedQueue.c"
+#line 1239 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1239 "TimedQueue.c"
+#line 1243 "TimedQueue.c"
 	}
 }
 
@@ -1243,37 +1247,37 @@ 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 1247 "TimedQueue.c"
+#line 1251 "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 1254 "TimedQueue.c"
+#line 1258 "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 1261 "TimedQueue.c"
+#line 1265 "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 1265 "TimedQueue.c"
+#line 1269 "TimedQueue.c"
 		}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_element_ref (object);
-#line 1269 "TimedQueue.c"
+#line 1273 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1273 "TimedQueue.c"
+#line 1277 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1277 "TimedQueue.c"
+#line 1281 "TimedQueue.c"
 }
 
 
@@ -1284,25 +1288,25 @@ static gchar* timed_queue_value_element_lcopy_value (const GValue* value, guint
 	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 1288 "TimedQueue.c"
+#line 1292 "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 1294 "TimedQueue.c"
+#line 1298 "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 1298 "TimedQueue.c"
+#line 1302 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_element_ref (value->data[0].v_pointer);
-#line 1302 "TimedQueue.c"
+#line 1306 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1306 "TimedQueue.c"
+#line 1310 "TimedQueue.c"
 }
 
 
@@ -1316,7 +1320,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 1320 "TimedQueue.c"
+#line 1324 "TimedQueue.c"
 }
 
 
@@ -1325,7 +1329,7 @@ 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 1329 "TimedQueue.c"
+#line 1333 "TimedQueue.c"
 }
 
 
@@ -1345,17 +1349,17 @@ 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 1349 "TimedQueue.c"
+#line 1353 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1353 "TimedQueue.c"
+#line 1357 "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 1359 "TimedQueue.c"
+#line 1363 "TimedQueue.c"
 	}
 }
 
@@ -1374,17 +1378,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 1378 "TimedQueue.c"
+#line 1382 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1382 "TimedQueue.c"
+#line 1386 "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 1388 "TimedQueue.c"
+#line 1392 "TimedQueue.c"
 	}
 }
 
@@ -1396,7 +1400,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 1400 "TimedQueue.c"
+#line 1404 "TimedQueue.c"
 }
 
 
@@ -1405,7 +1409,7 @@ 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 1409 "TimedQueue.c"
+#line 1413 "TimedQueue.c"
 }
 
 
@@ -1417,7 +1421,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 1421 "TimedQueue.c"
+#line 1425 "TimedQueue.c"
 }
 
 
@@ -1442,7 +1446,7 @@ static gpointer timed_queue_element_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1446 "TimedQueue.c"
+#line 1450 "TimedQueue.c"
 }
 
 
@@ -1455,7 +1459,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 1459 "TimedQueue.c"
+#line 1463 "TimedQueue.c"
 	}
 }
 
@@ -1463,7 +1467,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 1467 "TimedQueue.c"
+#line 1471 "TimedQueue.c"
 }
 
 
@@ -1472,7 +1476,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 1476 "TimedQueue.c"
+#line 1480 "TimedQueue.c"
 	}
 }
 
@@ -1482,11 +1486,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 1486 "TimedQueue.c"
+#line 1490 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1490 "TimedQueue.c"
+#line 1494 "TimedQueue.c"
 	}
 }
 
@@ -1494,37 +1498,37 @@ 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 1498 "TimedQueue.c"
+#line 1502 "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 1505 "TimedQueue.c"
+#line 1509 "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 1512 "TimedQueue.c"
+#line 1516 "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 1516 "TimedQueue.c"
+#line 1520 "TimedQueue.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_ref (object);
-#line 1520 "TimedQueue.c"
+#line 1524 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1524 "TimedQueue.c"
+#line 1528 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1528 "TimedQueue.c"
+#line 1532 "TimedQueue.c"
 }
 
 
@@ -1535,25 +1539,25 @@ static gchar* value_timed_queue_lcopy_value (const GValue* value, guint n_collec
 	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 1539 "TimedQueue.c"
+#line 1543 "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 1545 "TimedQueue.c"
+#line 1549 "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 1549 "TimedQueue.c"
+#line 1553 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_ref (value->data[0].v_pointer);
-#line 1553 "TimedQueue.c"
+#line 1557 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1557 "TimedQueue.c"
+#line 1561 "TimedQueue.c"
 }
 
 
@@ -1567,7 +1571,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 1571 "TimedQueue.c"
+#line 1575 "TimedQueue.c"
 }
 
 
@@ -1576,7 +1580,7 @@ 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 1580 "TimedQueue.c"
+#line 1584 "TimedQueue.c"
 }
 
 
@@ -1596,17 +1600,17 @@ 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 1600 "TimedQueue.c"
+#line 1604 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1604 "TimedQueue.c"
+#line 1608 "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 1610 "TimedQueue.c"
+#line 1614 "TimedQueue.c"
 	}
 }
 
@@ -1625,17 +1629,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 1629 "TimedQueue.c"
+#line 1633 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1633 "TimedQueue.c"
+#line 1637 "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 1639 "TimedQueue.c"
+#line 1643 "TimedQueue.c"
 	}
 }
 
@@ -1648,24 +1652,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 = 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 = 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 = 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 = 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 = 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 = 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 1669 "TimedQueue.c"
+#line 1673 "TimedQueue.c"
 }
 
 
@@ -1682,7 +1686,7 @@ 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 1686 "TimedQueue.c"
+#line 1690 "TimedQueue.c"
 }
 
 
@@ -1697,13 +1701,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 1701 "TimedQueue.c"
+#line 1705 "TimedQueue.c"
 		guint _tmp1_ = 0U;
 #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 1707 "TimedQueue.c"
+#line 1711 "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);
@@ -1715,7 +1719,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 1719 "TimedQueue.c"
+#line 1723 "TimedQueue.c"
 }
 
 
@@ -1740,7 +1744,7 @@ gpointer timed_queue_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1744 "TimedQueue.c"
+#line 1748 "TimedQueue.c"
 }
 
 
@@ -1753,7 +1757,7 @@ 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 1757 "TimedQueue.c"
+#line 1761 "TimedQueue.c"
 	}
 }
 
@@ -1787,11 +1791,15 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2__target_destroy_notify = equal_func_target_destroy_notify;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func = NULL;
+#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func_target = NULL;
+#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	equal_func_target_destroy_notify = NULL;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = priority;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, _tmp3_);
+	self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, _tmp3_);
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->g_type = g_type;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1805,6 +1813,10 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4__target_destroy_notify = hash_func_target_destroy_notify;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	hash_func = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	hash_func_target = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	hash_func_target_destroy_notify = NULL;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp5_ = equal_func;
@@ -1813,9 +1825,13 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp5__target_destroy_notify = equal_func_target_destroy_notify;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func_target = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	equal_func_target_destroy_notify = NULL;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp6_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp4_, _tmp4__target, _tmp4__target_destroy_notify, _tmp5_, _tmp5__target, _tmp5__target_destroy_notify, NULL, NULL, NULL);
+	_tmp6_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp4_, _tmp4__target, _tmp4__target_destroy_notify, _tmp5_, _tmp5__target, _tmp5__target_destroy_notify, NULL, NULL, NULL);
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->item_count);
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1838,14 +1854,14 @@ 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 1842 "TimedQueue.c"
+#line 1858 "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 1849 "TimedQueue.c"
+#line 1865 "TimedQueue.c"
 }
 
 
@@ -1863,7 +1879,7 @@ 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 1867 "TimedQueue.c"
+#line 1883 "TimedQueue.c"
 }
 
 
@@ -1878,7 +1894,7 @@ 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 1882 "TimedQueue.c"
+#line 1898 "TimedQueue.c"
 }
 
 
@@ -1900,7 +1916,7 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 	result = _tmp2_;
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1904 "TimedQueue.c"
+#line 1920 "TimedQueue.c"
 }
 
 
@@ -1927,7 +1943,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 1931 "TimedQueue.c"
+#line 1947 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -1937,7 +1953,7 @@ 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 1941 "TimedQueue.c"
+#line 1957 "TimedQueue.c"
 		GeeHashMap* _tmp6_ = NULL;
 		gconstpointer _tmp7_ = NULL;
 		gpointer _tmp8_ = NULL;
@@ -1949,11 +1965,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 1953 "TimedQueue.c"
+#line 1969 "TimedQueue.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = 1;
-#line 1957 "TimedQueue.c"
+#line 1973 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp9_ = self->priv->item_count;
@@ -1965,7 +1981,7 @@ 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 1969 "TimedQueue.c"
+#line 1985 "TimedQueue.c"
 }
 
 
@@ -1988,7 +2004,7 @@ 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 1992 "TimedQueue.c"
+#line 2008 "TimedQueue.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
@@ -2002,7 +2018,7 @@ 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 2006 "TimedQueue.c"
+#line 2022 "TimedQueue.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			gpointer item = NULL;
@@ -2022,7 +2038,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 2026 "TimedQueue.c"
+#line 2042 "TimedQueue.c"
 			}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -2038,7 +2054,7 @@ 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 2042 "TimedQueue.c"
+#line 2058 "TimedQueue.c"
 				GeeHashMap* _tmp12_ = NULL;
 				gconstpointer _tmp13_ = NULL;
 				gpointer _tmp14_ = NULL;
@@ -2050,11 +2066,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 2054 "TimedQueue.c"
+#line 2070 "TimedQueue.c"
 			} else {
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = 1;
-#line 2058 "TimedQueue.c"
+#line 2074 "TimedQueue.c"
 			}
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp15_ = self->priv->item_count;
@@ -2064,17 +2080,17 @@ 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 2068 "TimedQueue.c"
+#line 2084 "TimedQueue.c"
 		}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 2072 "TimedQueue.c"
+#line 2088 "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 2078 "TimedQueue.c"
+#line 2094 "TimedQueue.c"
 }
 
 
@@ -2096,7 +2112,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 2100 "TimedQueue.c"
+#line 2116 "TimedQueue.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = item;
@@ -2106,7 +2122,7 @@ 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 2110 "TimedQueue.c"
+#line 2126 "TimedQueue.c"
 }
 
 
@@ -2133,7 +2149,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	if (!_tmp2_) {
 #line 273 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 2137 "TimedQueue.c"
+#line 2153 "TimedQueue.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -2155,7 +2171,7 @@ 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 2159 "TimedQueue.c"
+#line 2175 "TimedQueue.c"
 		GeeHashMap* _tmp9_ = NULL;
 		gconstpointer _tmp10_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2164,7 +2180,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 		_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 2168 "TimedQueue.c"
+#line 2184 "TimedQueue.c"
 	} else {
 		GeeHashMap* _tmp11_ = NULL;
 		gconstpointer _tmp12_ = NULL;
@@ -2177,7 +2193,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 2181 "TimedQueue.c"
+#line 2197 "TimedQueue.c"
 	}
 }
 
@@ -2190,25 +2206,25 @@ 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 = 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 = 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 = 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 = 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 = 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 = hash_timed_queue_real_remove_first;
-#line 2205 "TimedQueue.c"
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_remove_first;
+#line 2221 "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 2212 "TimedQueue.c"
+#line 2228 "TimedQueue.c"
 }
 
 
@@ -2220,7 +2236,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 2224 "TimedQueue.c"
+#line 2240 "TimedQueue.c"
 }