Merge branch 'feature/upstream' into develop

1 files changed, 107 insertions, 107 deletions

diff --git a/src/core/util.c b/src/core/util.c
index 0ddab1f..f4143d3 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.34.7, the Vala compiler
+/* util.c generated by valac 0.36.6, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -184,8 +184,8 @@ struct _ParamSpecAggregateProgressMonitor {
 
 static gpointer singleton_collection_parent_class = NULL;
 static gpointer singleton_collection_singleton_iterator_parent_class = NULL;
-static GeeTraversableIface* singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL;
-static GeeIteratorIface* singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL;
+static GeeTraversableIface * singleton_collection_singleton_iterator_gee_traversable_parent_iface = NULL;
+static GeeIteratorIface * singleton_collection_singleton_iterator_gee_iterator_parent_iface = NULL;
 static gpointer unknown_total_monitor_parent_class = NULL;
 static gpointer aggregate_progress_monitor_parent_class = NULL;
 
@@ -196,8 +196,8 @@ enum  {
 	SINGLETON_COLLECTION_G_TYPE,
 	SINGLETON_COLLECTION_G_DUP_FUNC,
 	SINGLETON_COLLECTION_G_DESTROY_FUNC,
-	SINGLETON_COLLECTION_READ_ONLY,
-	SINGLETON_COLLECTION_SIZE
+	SINGLETON_COLLECTION_READ_ONLY_PROPERTY,
+	SINGLETON_COLLECTION_SIZE_PROPERTY
 };
 SingletonCollection* singleton_collection_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
 SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object);
@@ -215,18 +215,18 @@ enum  {
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_TYPE,
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DUP_FUNC,
 	SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC,
-	SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY,
-	SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID
+	SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY,
+	SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY
 };
 static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target);
 static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base);
 static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterator* base);
 static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base);
 static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base);
-static void singleton_collection_singleton_iterator_finalize (GObject* obj);
+static void singleton_collection_singleton_iterator_finalize (GObject * obj);
 static void _vala_singleton_collection_singleton_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_singleton_collection_singleton_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static void singleton_collection_finalize (GObject* obj);
+static void singleton_collection_finalize (GObject * obj);
 static void _vala_singleton_collection_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_singleton_collection_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -253,7 +253,7 @@ enum  {
 UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total);
-static void unknown_total_monitor_finalize (UnknownTotalMonitor* obj);
+static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj);
 gpointer aggregate_progress_monitor_ref (gpointer instance);
 void aggregate_progress_monitor_unref (gpointer instance);
 GParamSpec* param_spec_aggregate_progress_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -269,15 +269,15 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P
 AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
 void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name);
 gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total);
-static void aggregate_progress_monitor_finalize (AggregateProgressMonitor* obj);
+static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj);
 gboolean null_progress_monitor (guint64 count, guint64 total);
 gdouble degrees_to_radians (gdouble theta);
 
 
 SingletonCollection* singleton_collection_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer object) {
 	SingletonCollection * self = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func);
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -337,8 +337,8 @@ static void singleton_collection_real_clear (GeeAbstractCollection* base) {
 static gboolean singleton_collection_real_contains (GeeAbstractCollection* base, gconstpointer object) {
 	SingletonCollection * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 83 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 84 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -356,7 +356,7 @@ static gboolean singleton_collection_real_contains (GeeAbstractCollection* base,
 static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* base) {
 	SingletonCollection * self;
 	GeeIterator* result = NULL;
-	SingletonCollectionSingletonIterator* _tmp0_ = NULL;
+	SingletonCollectionSingletonIterator* _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 88 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -372,8 +372,8 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b
 static gboolean singleton_collection_real_remove (GeeAbstractCollection* base, gconstpointer item) {
 	SingletonCollection * self;
 	gboolean result = FALSE;
-	gconstpointer _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gconstpointer _tmp1_;
 #line 91 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 92 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -417,7 +417,7 @@ static gint singleton_collection_real_get_size (GeeAbstractCollection* base) {
 	gint result;
 	SingletonCollection* self;
 	gint _tmp0_ = 0;
-	gconstpointer _tmp1_ = NULL;
+	gconstpointer _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
 #line 103 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -449,8 +449,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static SingletonCollectionSingletonIterator* singleton_collection_singleton_iterator_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, SingletonCollection* c) {
 	SingletonCollectionSingletonIterator * self = NULL;
-	SingletonCollection* _tmp0_ = NULL;
-	SingletonCollection* _tmp1_ = NULL;
+	SingletonCollection* _tmp0_;
+	SingletonCollection* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_SINGLETON_COLLECTION (c), NULL);
 #line 19 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -485,12 +485,12 @@ static SingletonCollectionSingletonIterator* singleton_collection_singleton_iter
 static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTraversable* base, GeeForallFunc f, void* f_target) {
 	SingletonCollectionSingletonIterator * self;
 	gboolean result = FALSE;
-	GeeForallFunc _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	SingletonCollection* _tmp1_ = NULL;
-	gconstpointer _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	GeeForallFunc _tmp0_;
+	void* _tmp0__target;
+	SingletonCollection* _tmp1_;
+	gconstpointer _tmp2_;
+	gpointer _tmp3_;
+	gboolean _tmp4_;
 #line 31 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 32 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -516,8 +516,8 @@ static gboolean singleton_collection_singleton_iterator_real_foreach (GeeTravers
 static gpointer singleton_collection_singleton_iterator_real_get (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
 	gpointer result = NULL;
-	gconstpointer _tmp0_ = NULL;
-	gpointer _tmp1_ = NULL;
+	gconstpointer _tmp0_;
+	gpointer _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 36 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -548,10 +548,10 @@ static gboolean singleton_collection_singleton_iterator_real_has_next (GeeIterat
 static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	SingletonCollection* _tmp1_ = NULL;
-	gconstpointer _tmp2_ = NULL;
-	gpointer _tmp3_ = NULL;
+	gboolean _tmp0_;
+	SingletonCollection* _tmp1_;
+	gconstpointer _tmp2_;
+	gpointer _tmp3_;
 #line 43 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 44 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -586,7 +586,7 @@ static gboolean singleton_collection_singleton_iterator_real_next (GeeIterator*
 
 static void singleton_collection_singleton_iterator_real_remove (GeeIterator* base) {
 	SingletonCollectionSingletonIterator * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 54 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -594,7 +594,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba
 #line 54 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!_tmp0_) {
 #line 597 "util.c"
-		SingletonCollection* _tmp1_ = NULL;
+		SingletonCollection* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp1_ = self->priv->c;
 #line 55 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -616,7 +616,7 @@ static void singleton_collection_singleton_iterator_real_remove (GeeIterator* ba
 static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeIterator* base) {
 	gboolean result;
 	SingletonCollectionSingletonIterator* self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 24 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -632,7 +632,7 @@ static gboolean singleton_collection_singleton_iterator_real_get_read_only (GeeI
 static gboolean singleton_collection_singleton_iterator_real_get_valid (GeeIterator* base) {
 	gboolean result;
 	SingletonCollectionSingletonIterator* self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
 #line 28 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -663,9 +663,9 @@ static void singleton_collection_singleton_iterator_class_init (SingletonCollect
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY, g_param_spec_boolean ("valid", "valid", "valid", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 670 "util.c"
 }
 
@@ -695,13 +695,13 @@ static void singleton_collection_singleton_iterator_gee_traversable_interface_in
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	singleton_collection_singleton_iterator_gee_traversable_parent_iface = g_type_interface_peek_parent (iface);
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->foreach = (gboolean (*)(GeeTraversable*, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach;
+	iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) singleton_collection_singleton_iterator_real_foreach;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_type = (GType(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_type;
+	iface->get_g_type = (GType (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_type;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_dup_func = (GBoxedCopyFunc(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func;
+	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_dup_func;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get_g_destroy_func = (GDestroyNotify(*)(GeeTraversable*)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func;
+	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) singleton_collection_singleton_iterator_gee_traversable_get_g_destroy_func;
 #line 706 "util.c"
 }
 
@@ -710,13 +710,13 @@ static void singleton_collection_singleton_iterator_gee_iterator_interface_init
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	singleton_collection_singleton_iterator_gee_iterator_parent_iface = g_type_interface_peek_parent (iface);
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->get = (gpointer (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_get;
+	iface->get = (gpointer (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_get;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->has_next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_has_next;
+	iface->has_next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_has_next;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->next = (gboolean (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_next;
+	iface->next = (gboolean (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_next;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-	iface->remove = (void (*)(GeeIterator*)) singleton_collection_singleton_iterator_real_remove;
+	iface->remove = (void (*) (GeeIterator *)) singleton_collection_singleton_iterator_real_remove;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	iface->get_read_only = singleton_collection_singleton_iterator_real_get_read_only;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -736,7 +736,7 @@ static void singleton_collection_singleton_iterator_instance_init (SingletonColl
 }
 
 
-static void singleton_collection_singleton_iterator_finalize (GObject* obj) {
+static void singleton_collection_singleton_iterator_finalize (GObject * obj) {
 	SingletonCollectionSingletonIterator * self;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SINGLETON_COLLECTION_TYPE_SINGLETON_ITERATOR, SingletonCollectionSingletonIterator);
@@ -772,13 +772,13 @@ static void _vala_singleton_collection_singleton_iterator_get_property (GObject
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 	switch (property_id) {
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY:
+		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_READ_ONLY_PROPERTY:
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_iterator_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator)));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		break;
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID:
+		case SINGLETON_COLLECTION_SINGLETON_ITERATOR_VALID_PROPERTY:
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_iterator_get_valid (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ITERATOR, GeeIterator)));
 #line 14 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -834,15 +834,15 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_type_class_add_private (klass, sizeof (SingletonCollectionPrivate));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->add = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_add;
+	((GeeAbstractCollectionClass *) klass)->add = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_add;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->clear = (void (*)(GeeAbstractCollection*)) singleton_collection_real_clear;
+	((GeeAbstractCollectionClass *) klass)->clear = (void (*) (GeeAbstractCollection *)) singleton_collection_real_clear;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_contains;
+	((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_contains;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*)(GeeAbstractCollection*)) singleton_collection_real_iterator;
+	((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*) (GeeAbstractCollection *)) singleton_collection_real_iterator;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_remove;
+	((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*) (GeeAbstractCollection *, gconstpointer)) singleton_collection_real_remove;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	GEE_ABSTRACT_COLLECTION_CLASS (klass)->get_read_only = singleton_collection_real_get_read_only;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -860,9 +860,9 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SINGLETON_COLLECTION_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 867 "util.c"
 }
 
@@ -874,7 +874,7 @@ static void singleton_collection_instance_init (SingletonCollection * self) {
 }
 
 
-static void singleton_collection_finalize (GObject* obj) {
+static void singleton_collection_finalize (GObject * obj) {
 	SingletonCollection * self;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLETON_COLLECTION, SingletonCollection);
@@ -904,13 +904,13 @@ static void _vala_singleton_collection_get_property (GObject * object, guint pro
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 	switch (property_id) {
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_READ_ONLY:
+		case SINGLETON_COLLECTION_READ_ONLY_PROPERTY:
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_boolean (value, gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		break;
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
-		case SINGLETON_COLLECTION_SIZE:
+		case SINGLETON_COLLECTION_SIZE_PROPERTY:
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
 		g_value_set_int (value, gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)));
 #line 13 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1059,9 +1059,9 @@ GType marker_get_type (void) {
 
 UnknownTotalMonitor* unknown_total_monitor_construct (GType object_type, guint64 total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) {
 	UnknownTotalMonitor* self = NULL;
-	guint64 _tmp0_ = 0ULL;
-	ProgressMonitor _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	guint64 _tmp0_;
+	ProgressMonitor _tmp1_;
+	void* _tmp1__target;
 #line 147 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (UnknownTotalMonitor*) g_type_create_instance (object_type);
 #line 148 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1091,11 +1091,11 @@ UnknownTotalMonitor* unknown_total_monitor_new (guint64 total, ProgressMonitor w
 
 gboolean unknown_total_monitor_monitor (UnknownTotalMonitor* self, guint64 count, guint64 total) {
 	gboolean result = FALSE;
-	ProgressMonitor _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp2_ = 0ULL;
-	gboolean _tmp3_ = FALSE;
+	ProgressMonitor _tmp0_;
+	void* _tmp0__target;
+	guint64 _tmp1_;
+	guint64 _tmp2_;
+	gboolean _tmp3_;
 #line 152 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_UNKNOWN_TOTAL_MONITOR (self), FALSE);
 #line 153 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1158,7 +1158,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (collect_values[0].v_pointer) {
 #line 1161 "util.c"
-		UnknownTotalMonitor* object;
+		UnknownTotalMonitor * object;
 		object = collect_values[0].v_pointer;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1185,7 +1185,7 @@ static gchar* value_unknown_total_monitor_collect_value (GValue* value, guint n_
 
 
 static gchar* value_unknown_total_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	UnknownTotalMonitor** object_p;
+	UnknownTotalMonitor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!object_p) {
@@ -1237,7 +1237,7 @@ gpointer value_get_unknown_total_monitor (const GValue* value) {
 
 
 void value_set_unknown_total_monitor (GValue* value, gpointer v_object) {
-	UnknownTotalMonitor* old;
+	UnknownTotalMonitor * old;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR));
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1268,7 +1268,7 @@ void value_set_unknown_total_monitor (GValue* value, gpointer v_object) {
 
 
 void value_take_unknown_total_monitor (GValue* value, gpointer v_object) {
-	UnknownTotalMonitor* old;
+	UnknownTotalMonitor * old;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UNKNOWN_TOTAL_MONITOR));
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1316,7 +1316,7 @@ static void unknown_total_monitor_instance_init (UnknownTotalMonitor * self) {
 }
 
 
-static void unknown_total_monitor_finalize (UnknownTotalMonitor* obj) {
+static void unknown_total_monitor_finalize (UnknownTotalMonitor * obj) {
 	UnknownTotalMonitor * self;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UNKNOWN_TOTAL_MONITOR, UnknownTotalMonitor);
@@ -1341,7 +1341,7 @@ GType unknown_total_monitor_get_type (void) {
 
 
 gpointer unknown_total_monitor_ref (gpointer instance) {
-	UnknownTotalMonitor* self;
+	UnknownTotalMonitor * self;
 	self = instance;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1352,7 +1352,7 @@ gpointer unknown_total_monitor_ref (gpointer instance) {
 
 
 void unknown_total_monitor_unref (gpointer instance) {
-	UnknownTotalMonitor* self;
+	UnknownTotalMonitor * self;
 	self = instance;
 #line 143 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1367,9 +1367,9 @@ void unknown_total_monitor_unref (gpointer instance) {
 
 AggregateProgressMonitor* aggregate_progress_monitor_construct (GType object_type, guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target) {
 	AggregateProgressMonitor* self = NULL;
-	guint64 _tmp0_ = 0ULL;
-	ProgressMonitor _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
+	guint64 _tmp0_;
+	ProgressMonitor _tmp1_;
+	void* _tmp1__target;
 #line 165 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = (AggregateProgressMonitor*) g_type_create_instance (object_type);
 #line 166 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1398,13 +1398,13 @@ AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, P
 
 
 void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name) {
-	const gchar* _tmp0_ = NULL;
-	guint64 _tmp1_ = 0ULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	guint64 _tmp4_ = 0ULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	guint64 _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	guint64 _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 170 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self));
 #line 170 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1438,16 +1438,16 @@ void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const
 gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, guint64 count, guint64 total) {
 	gboolean result = FALSE;
 	guint64 _tmp0_ = 0ULL;
-	guint64 _tmp1_ = 0ULL;
-	guint64 _tmp5_ = 0ULL;
-	guint64 _tmp6_ = 0ULL;
-	guint64 _tmp7_ = 0ULL;
-	guint64 _tmp9_ = 0ULL;
-	ProgressMonitor _tmp10_ = NULL;
-	void* _tmp10__target = NULL;
-	guint64 _tmp11_ = 0ULL;
-	guint64 _tmp12_ = 0ULL;
-	gboolean _tmp13_ = FALSE;
+	guint64 _tmp1_;
+	guint64 _tmp5_;
+	guint64 _tmp6_;
+	guint64 _tmp7_;
+	guint64 _tmp9_;
+	ProgressMonitor _tmp10_;
+	void* _tmp10__target;
+	guint64 _tmp11_;
+	guint64 _tmp12_;
+	gboolean _tmp13_;
 #line 175 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_val_if_fail (IS_AGGREGATE_PROGRESS_MONITOR (self), FALSE);
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1455,8 +1455,8 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (_tmp1_ != G_MAXUINT64) {
 #line 1458 "util.c"
-		guint64 _tmp2_ = 0ULL;
-		guint64 _tmp3_ = 0ULL;
+		guint64 _tmp2_;
+		guint64 _tmp3_;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp2_ = count;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1465,7 +1465,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 		_tmp0_ = _tmp2_ - _tmp3_;
 #line 1467 "util.c"
 	} else {
-		guint64 _tmp4_ = 0ULL;
+		guint64 _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp4_ = count;
 #line 177 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1483,7 +1483,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 #line 178 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (_tmp6_ > _tmp7_) {
 #line 1486 "util.c"
-		guint64 _tmp8_ = 0ULL;
+		guint64 _tmp8_;
 #line 179 "/home/jens/Source/shotwell/src/core/util.vala"
 		_tmp8_ = self->priv->grand_total;
 #line 179 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1554,7 +1554,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (collect_values[0].v_pointer) {
 #line 1557 "util.c"
-		AggregateProgressMonitor* object;
+		AggregateProgressMonitor * object;
 		object = collect_values[0].v_pointer;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -1581,7 +1581,7 @@ static gchar* value_aggregate_progress_monitor_collect_value (GValue* value, gui
 
 
 static gchar* value_aggregate_progress_monitor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	AggregateProgressMonitor** object_p;
+	AggregateProgressMonitor ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (!object_p) {
@@ -1633,7 +1633,7 @@ gpointer value_get_aggregate_progress_monitor (const GValue* value) {
 
 
 void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) {
-	AggregateProgressMonitor* old;
+	AggregateProgressMonitor * old;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR));
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1664,7 +1664,7 @@ void value_set_aggregate_progress_monitor (GValue* value, gpointer v_object) {
 
 
 void value_take_aggregate_progress_monitor (GValue* value, gpointer v_object) {
-	AggregateProgressMonitor* old;
+	AggregateProgressMonitor * old;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AGGREGATE_PROGRESS_MONITOR));
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -1716,7 +1716,7 @@ static void aggregate_progress_monitor_instance_init (AggregateProgressMonitor *
 }
 
 
-static void aggregate_progress_monitor_finalize (AggregateProgressMonitor* obj) {
+static void aggregate_progress_monitor_finalize (AggregateProgressMonitor * obj) {
 	AggregateProgressMonitor * self;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AGGREGATE_PROGRESS_MONITOR, AggregateProgressMonitor);
@@ -1741,7 +1741,7 @@ GType aggregate_progress_monitor_get_type (void) {
 
 
 gpointer aggregate_progress_monitor_ref (gpointer instance) {
-	AggregateProgressMonitor* self;
+	AggregateProgressMonitor * self;
 	self = instance;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1752,7 +1752,7 @@ gpointer aggregate_progress_monitor_ref (gpointer instance) {
 
 
 void aggregate_progress_monitor_unref (gpointer instance) {
-	AggregateProgressMonitor* self;
+	AggregateProgressMonitor * self;
 	self = instance;
 #line 159 "/home/jens/Source/shotwell/src/core/util.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1777,7 +1777,7 @@ gboolean null_progress_monitor (guint64 count, guint64 total) {
 
 gdouble degrees_to_radians (gdouble theta) {
 	gdouble result = 0.0;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/core/util.vala"
 	_tmp0_ = theta;
 #line 195 "/home/jens/Source/shotwell/src/core/util.vala"