Merge branch 'feature/upstream' into develop

1 files changed, 355 insertions, 355 deletions

diff --git a/src/util/misc.c b/src/util/misc.c
index 69a38e7..98b6719 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.7, the Vala compiler
+/* misc.c generated by valac 0.36.6, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -251,7 +251,7 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self);
 static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
 void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule);
-static void one_shot_scheduler_finalize (OneShotScheduler* obj);
+static void one_shot_scheduler_finalize (OneShotScheduler * obj);
 gpointer op_timer_ref (gpointer instance);
 void op_timer_unref (gpointer instance);
 GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -268,13 +268,13 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name);
 void op_timer_start (OpTimer* self);
 void op_timer_stop (OpTimer* self);
 gchar* op_timer_to_string (OpTimer* self);
-static void op_timer_finalize (OpTimer* obj);
+static void op_timer_finalize (OpTimer * obj);
 
 
 guint int64_hash (gint64* n) {
 	guint result = 0U;
 	guint8* u8 = NULL;
-	gint64* _tmp0_ = NULL;
+	gint64* _tmp0_;
 	guint hash = 0U;
 #line 9 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = n;
@@ -295,14 +295,14 @@ guint int64_hash (gint64* n) {
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			while (TRUE) {
 #line 298 "misc.c"
-				gint _tmp3_ = 0;
-				guint _tmp4_ = 0U;
-				guint _tmp5_ = 0U;
-				guint8* _tmp6_ = NULL;
+				gint _tmp3_;
+				guint _tmp4_;
+				guint _tmp5_;
+				guint8* _tmp6_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (!_tmp1_) {
 #line 305 "misc.c"
-					gint _tmp2_ = 0;
+					gint _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp2_ = ctr;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -344,9 +344,9 @@ guint int64_hash (gint64* n) {
 gboolean int64_equal (gint64* a, gint64* b) {
 	gboolean result = FALSE;
 	gint64* bia = NULL;
-	gint64* _tmp0_ = NULL;
+	gint64* _tmp0_;
 	gint64* bib = NULL;
-	gint64* _tmp1_ = NULL;
+	gint64* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -366,9 +366,9 @@ gboolean int64_equal (gint64* a, gint64* b) {
 gint int64_compare (gint64* a, gint64* b) {
 	gint result = 0;
 	gint64 diff = 0LL;
-	gint64* _tmp0_ = NULL;
-	gint64* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	gint64* _tmp0_;
+	gint64* _tmp1_;
+	gint64 _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -385,7 +385,7 @@ gint int64_compare (gint64* a, gint64* b) {
 		return result;
 #line 387 "misc.c"
 	} else {
-		gint64 _tmp3_ = 0LL;
+		gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = diff;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -409,11 +409,11 @@ gint int64_compare (gint64* a, gint64* b) {
 gint uint64_compare (guint64* a, guint64* b) {
 	gint result = 0;
 	guint64 a64 = 0ULL;
-	guint64* _tmp0_ = NULL;
+	guint64* _tmp0_;
 	guint64 b64 = 0ULL;
-	guint64* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
-	guint64 _tmp3_ = 0ULL;
+	guint64* _tmp1_;
+	guint64 _tmp2_;
+	guint64 _tmp3_;
 #line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = a;
 #line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -434,8 +434,8 @@ gint uint64_compare (guint64* a, guint64* b) {
 		return result;
 #line 436 "misc.c"
 	} else {
-		guint64 _tmp4_ = 0ULL;
-		guint64 _tmp5_ = 0ULL;
+		guint64 _tmp4_;
+		guint64 _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = a64;
 #line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -460,8 +460,8 @@ gint uint64_compare (guint64* a, guint64* b) {
 
 gboolean bool_value_equals (GValue* a, GValue* b) {
 	gboolean result = FALSE;
-	GValue _tmp0_ = {0};
-	GValue _tmp1_ = {0};
+	GValue _tmp0_;
+	GValue _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -480,8 +480,8 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
 
 gboolean int_value_equals (GValue* a, GValue* b) {
 	gboolean result = FALSE;
-	GValue _tmp0_ = {0};
-	GValue _tmp1_ = {0};
+	GValue _tmp0_;
+	GValue _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -500,10 +500,10 @@ gboolean int_value_equals (GValue* a, GValue* b) {
 
 gulong timeval_to_ms (GTimeVal* time_val) {
 	gulong result = 0UL;
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	GTimeVal _tmp2_;
+	glong _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (time_val != NULL, 0UL);
 #line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -525,7 +525,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
 gulong now_ms (void) {
 	gulong result = 0UL;
 	GTimeVal _tmp0_ = {0};
-	gulong _tmp1_ = 0UL;
+	gulong _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_get_current_time (&_tmp0_);
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -541,8 +541,8 @@ gulong now_ms (void) {
 gulong now_sec (void) {
 	gulong result = 0UL;
 	GTimeVal time_val = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_get_current_time (&time_val);
 #line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -559,7 +559,7 @@ gulong now_sec (void) {
 
 inline time_t now_time_t (void) {
 	time_t result = 0;
-	gulong _tmp0_ = 0UL;
+	gulong _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = now_sec ();
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -572,13 +572,13 @@ inline time_t now_time_t (void) {
 
 gchar* md5_binary (guint8* buffer, gsize length) {
 	gchar* result = NULL;
-	gsize _tmp0_ = 0UL;
+	gsize _tmp0_;
 	GChecksum* md5 = NULL;
-	GChecksum* _tmp1_ = NULL;
-	guint8* _tmp2_ = NULL;
-	gsize _tmp3_ = 0UL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GChecksum* _tmp1_;
+	guint8* _tmp2_;
+	gsize _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = length;
 #line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -610,17 +610,17 @@ gchar* md5_binary (guint8* buffer, gsize length) {
 gchar* md5_file (GFile* file, GError** error) {
 	gchar* result = NULL;
 	GChecksum* md5 = NULL;
-	GChecksum* _tmp0_ = NULL;
+	GChecksum* _tmp0_;
 	guint8* buffer = NULL;
-	guint8* _tmp1_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
+	guint8* _tmp1_;
+	gint buffer_length1;
+	gint _buffer_size_;
 	GFileInputStream* fins = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileInputStream* _tmp3_ = NULL;
-	GChecksum* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
+	GFile* _tmp2_;
+	GFileInputStream* _tmp3_;
+	GChecksum* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
@@ -662,15 +662,15 @@ gchar* md5_file (GFile* file, GError** error) {
 		while (TRUE) {
 #line 664 "misc.c"
 			gsize bytes_read = 0UL;
-			GFileInputStream* _tmp5_ = NULL;
-			guint8* _tmp6_ = NULL;
-			gint _tmp6__length1 = 0;
-			gssize _tmp7_ = 0L;
-			gsize _tmp8_ = 0UL;
-			GChecksum* _tmp9_ = NULL;
-			guint8* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gsize _tmp11_ = 0UL;
+			GFileInputStream* _tmp5_;
+			guint8* _tmp6_;
+			gint _tmp6__length1;
+			gssize _tmp7_;
+			gsize _tmp8_;
+			GChecksum* _tmp9_;
+			guint8* _tmp10_;
+			gint _tmp10__length1;
+			gsize _tmp11_;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp4_) {
 #line 677 "misc.c"
@@ -723,7 +723,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		}
 	}
 	{
-		GFileInputStream* _tmp12_ = NULL;
+		GFileInputStream* _tmp12_;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -738,11 +738,11 @@ gchar* md5_file (GFile* file, GError** error) {
 	__catch5_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		err = _inner_error_;
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -804,20 +804,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GeeSet* _tmp2_ = NULL;
+	GeeSet* _tmp2_;
 	gboolean _tmp7_ = FALSE;
-	GeeSet* _tmp8_ = NULL;
+	GeeSet* _tmp8_;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-	GeeSet* _tmp16_ = NULL;
+	GeeSet* _tmp16_;
 	gboolean _tmp21_ = FALSE;
-	GeeSet* _tmp22_ = NULL;
-	GeeSet* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	GeeSet* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	GeeSet* _tmp22_;
+	GeeSet* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	GeeSet* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
 #line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE);
 #line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -827,9 +827,9 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ != NULL) {
 #line 830 "misc.c"
-		GeeSet* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
+		GeeSet* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = a;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -847,7 +847,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
 #line 850 "misc.c"
-		GeeSet* _tmp6_ = NULL;
+		GeeSet* _tmp6_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = b;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -872,15 +872,15 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	if (_tmp8_ == NULL) {
 #line 874 "misc.c"
 		gboolean _tmp9_ = FALSE;
-		GeeSet* _tmp10_ = NULL;
+		GeeSet* _tmp10_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp10_ != NULL) {
 #line 881 "misc.c"
-			GeeSet* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			GeeSet* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -916,7 +916,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp16_ == NULL) {
 #line 919 "misc.c"
-		GeeSet* _tmp17_ = NULL;
+		GeeSet* _tmp17_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -934,13 +934,13 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 935 "misc.c"
 	} else {
 		gboolean _tmp18_ = FALSE;
-		GeeSet* _tmp19_ = NULL;
+		GeeSet* _tmp19_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp19_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp19_ != NULL) {
 #line 943 "misc.c"
-			GeeSet* _tmp20_ = NULL;
+			GeeSet* _tmp20_;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -968,7 +968,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp22_ == NULL) {
 #line 971 "misc.c"
-		GeeSet* _tmp23_ = NULL;
+		GeeSet* _tmp23_;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp23_ = b;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1009,8 +1009,8 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	}
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp30_ = NULL;
-		GeeIterator* _tmp31_ = NULL;
+		GeeSet* _tmp30_;
+		GeeIterator* _tmp31_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp30_ = a;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1020,14 +1020,14 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1023 "misc.c"
-			GeeIterator* _tmp32_ = NULL;
-			gboolean _tmp33_ = FALSE;
+			GeeIterator* _tmp32_;
+			gboolean _tmp33_;
 			gchar* element = NULL;
-			GeeIterator* _tmp34_ = NULL;
-			gpointer _tmp35_ = NULL;
-			GeeSet* _tmp36_ = NULL;
-			const gchar* _tmp37_ = NULL;
-			gboolean _tmp38_ = FALSE;
+			GeeIterator* _tmp34_;
+			gpointer _tmp35_;
+			GeeSet* _tmp36_;
+			const gchar* _tmp37_;
+			gboolean _tmp38_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp32_ = _element_it;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1088,16 +1088,16 @@ static gpointer _g_object_ref0 (gpointer self) {
 GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	GeeSet* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GeeSet* _tmp1_ = NULL;
+	GeeSet* _tmp1_;
 	gboolean _tmp6_ = FALSE;
-	GeeSet* _tmp7_ = NULL;
+	GeeSet* _tmp7_;
 	GeeSet* intersection = NULL;
-	GeeHashSet* _tmp12_ = NULL;
+	GeeHashSet* _tmp12_;
 	GeeSet* _tmp41_ = NULL;
-	GeeSet* _tmp42_ = NULL;
-	gint _tmp43_ = 0;
-	gint _tmp44_ = 0;
-	GeeSet* _tmp46_ = NULL;
+	GeeSet* _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
+	GeeSet* _tmp46_;
 #line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL);
 #line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1109,7 +1109,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != NULL) {
 #line 1112 "misc.c"
-		GeeSet* _tmp2_ = NULL;
+		GeeSet* _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = b;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1123,14 +1123,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
 #line 1126 "misc.c"
-		GeeSet* _tmp3_ = NULL;
+		GeeSet* _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = excluded;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp3_ != NULL) {
 #line 1132 "misc.c"
-			GeeSet* _tmp4_ = NULL;
-			GeeSet* _tmp5_ = NULL;
+			GeeSet* _tmp4_;
+			GeeSet* _tmp5_;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = excluded;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1150,7 +1150,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ == NULL) {
 #line 1153 "misc.c"
-		GeeSet* _tmp8_ = NULL;
+		GeeSet* _tmp8_;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = b;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1164,14 +1164,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp6_) {
 #line 1167 "misc.c"
-		GeeSet* _tmp9_ = NULL;
+		GeeSet* _tmp9_;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = excluded;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp9_ != NULL) {
 #line 1173 "misc.c"
-			GeeSet* _tmp10_ = NULL;
-			GeeSet* _tmp11_ = NULL;
+			GeeSet* _tmp10_;
+			GeeSet* _tmp11_;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = excluded;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1193,8 +1193,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 1194 "misc.c"
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp13_ = NULL;
-		GeeIterator* _tmp14_ = NULL;
+		GeeSet* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp13_ = a;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1204,14 +1204,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1207 "misc.c"
-			GeeIterator* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
+			GeeIterator* _tmp15_;
+			gboolean _tmp16_;
 			gchar* element = NULL;
-			GeeIterator* _tmp17_ = NULL;
-			gpointer _tmp18_ = NULL;
-			GeeSet* _tmp19_ = NULL;
-			const gchar* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
+			GeeIterator* _tmp17_;
+			gpointer _tmp18_;
+			GeeSet* _tmp19_;
+			const gchar* _tmp20_;
+			gboolean _tmp21_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = _element_it;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1237,8 +1237,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp21_) {
 #line 1240 "misc.c"
-				GeeSet* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
+				GeeSet* _tmp22_;
+				const gchar* _tmp23_;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp22_ = intersection;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1247,14 +1247,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
 #line 1249 "misc.c"
 			} else {
-				GeeSet* _tmp24_ = NULL;
+				GeeSet* _tmp24_;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp24_ = excluded;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp24_ != NULL) {
 #line 1256 "misc.c"
-					GeeSet* _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
+					GeeSet* _tmp25_;
+					const gchar* _tmp26_;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp25_ = excluded;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1274,8 +1274,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	}
 	{
 		GeeIterator* _element_it = NULL;
-		GeeSet* _tmp27_ = NULL;
-		GeeIterator* _tmp28_ = NULL;
+		GeeSet* _tmp27_;
+		GeeIterator* _tmp28_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp27_ = b;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1285,14 +1285,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1288 "misc.c"
-			GeeIterator* _tmp29_ = NULL;
-			gboolean _tmp30_ = FALSE;
+			GeeIterator* _tmp29_;
+			gboolean _tmp30_;
 			gchar* element = NULL;
-			GeeIterator* _tmp31_ = NULL;
-			gpointer _tmp32_ = NULL;
-			GeeSet* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			gboolean _tmp35_ = FALSE;
+			GeeIterator* _tmp31_;
+			gpointer _tmp32_;
+			GeeSet* _tmp33_;
+			const gchar* _tmp34_;
+			gboolean _tmp35_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp29_ = _element_it;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1318,8 +1318,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp35_) {
 #line 1321 "misc.c"
-				GeeSet* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
+				GeeSet* _tmp36_;
+				const gchar* _tmp37_;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp36_ = intersection;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1328,14 +1328,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
 #line 1330 "misc.c"
 			} else {
-				GeeSet* _tmp38_ = NULL;
+				GeeSet* _tmp38_;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp38_ = excluded;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp38_ != NULL) {
 #line 1337 "misc.c"
-					GeeSet* _tmp39_ = NULL;
-					const gchar* _tmp40_ = NULL;
+					GeeSet* _tmp39_;
+					const gchar* _tmp40_;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp39_ = excluded;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1362,7 +1362,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp44_ > 0) {
 #line 1365 "misc.c"
-		GeeSet* _tmp45_ = NULL;
+		GeeSet* _tmp45_;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp45_ = intersection;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1388,25 +1388,25 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	guchar* result = NULL;
 	gint64* ids = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint64* _tmp3_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint64* _tmp3_;
+	gint ids_length1;
+	gint _ids_size_;
 	gint ctr = 0;
 	gsize bytes = 0UL;
-	GeeCollection* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	GeeCollection* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	guchar* serialized = NULL;
-	guchar* _tmp19_ = NULL;
-	gint serialized_length1 = 0;
-	gint _serialized_size_ = 0;
-	gint64* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	guchar* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
+	guchar* _tmp19_;
+	gint serialized_length1;
+	gint _serialized_size_;
+	gint64* _tmp20_;
+	gint _tmp20__length1;
+	guchar* _tmp21_;
+	gint _tmp21__length1;
 #line 169 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL);
 #line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1428,8 +1428,8 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 #line 1429 "misc.c"
 	{
 		GeeIterator* _photo_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = photos;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1439,18 +1439,18 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1442 "misc.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			Photo* photo = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			gint64* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gint _tmp11_ = 0;
-			Photo* _tmp12_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			gint64* _tmp10_;
+			gint _tmp10__length1;
+			gint _tmp11_;
+			Photo* _tmp12_;
 			PhotoID _tmp13_ = {0};
-			gint64 _tmp14_ = 0LL;
-			gint64 _tmp15_ = 0LL;
+			gint64 _tmp14_;
+			gint64 _tmp15_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _photo_it;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1538,22 +1538,22 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	GeeList* result = NULL;
 	gsize count = 0UL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gsize _tmp2_ = 0UL;
+	gsize _tmp2_;
 	gint64* ids = NULL;
-	gsize _tmp4_ = 0UL;
-	gint64* _tmp5_ = NULL;
-	gint ids_length1 = 0;
-	gint _ids_size_ = 0;
-	gint64* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	guchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	gsize _tmp4_;
+	gint64* _tmp5_;
+	gint ids_length1;
+	gint _ids_size_;
+	gint64* _tmp6_;
+	gint _tmp6__length1;
+	guchar* _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	gint64* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	GeeArrayList* _tmp9_;
+	gint64* _tmp10_;
+	gint _tmp10__length1;
 #line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
 #line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1566,7 +1566,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		_tmp1_ = TRUE;
 #line 1568 "misc.c"
 	} else {
-		guchar* _tmp3_ = NULL;
+		guchar* _tmp3_;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1627,8 +1627,8 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 			id = id_collection[id_it];
 #line 1629 "misc.c"
 			{
-				GeeArrayList* _tmp11_ = NULL;
-				gint64 _tmp12_ = 0LL;
+				GeeArrayList* _tmp11_;
+				gint64 _tmp12_;
 				PhotoID _tmp13_ = {0};
 #line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = list;
@@ -1655,25 +1655,25 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	guchar* result = NULL;
 	GdkAtom* atoms = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	GdkAtom* _tmp3_ = NULL;
-	gint atoms_length1 = 0;
-	gint _atoms_size_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	GdkAtom* _tmp3_;
+	gint atoms_length1;
+	gint _atoms_size_;
 	gint ctr = 0;
 	gsize bytes = 0UL;
-	GeeCollection* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GeeCollection* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	guchar* serialized = NULL;
-	guchar* _tmp20_ = NULL;
-	gint serialized_length1 = 0;
-	gint _serialized_size_ = 0;
-	GdkAtom* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	guchar* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
+	guchar* _tmp20_;
+	gint serialized_length1;
+	gint _serialized_size_;
+	GdkAtom* _tmp21_;
+	gint _tmp21__length1;
+	guchar* _tmp22_;
+	gint _tmp22__length1;
 #line 197 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL);
 #line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1695,8 +1695,8 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 #line 1696 "misc.c"
 	{
 		GeeIterator* _current_media_it = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = media;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1706,19 +1706,19 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
 #line 1709 "misc.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSource* current_media = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			GdkAtom* _tmp10_ = NULL;
-			gint _tmp10__length1 = 0;
-			gint _tmp11_ = 0;
-			MediaSource* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
-			GdkAtom _tmp15_ = 0U;
-			GdkAtom _tmp16_ = 0U;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			GdkAtom* _tmp10_;
+			gint _tmp10__length1;
+			gint _tmp11_;
+			MediaSource* _tmp12_;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
+			GdkAtom _tmp15_;
+			GdkAtom _tmp16_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _current_media_it;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1810,22 +1810,22 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	GeeList* result = NULL;
 	gsize count = 0UL;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gsize _tmp2_ = 0UL;
+	gsize _tmp2_;
 	GdkAtom* atoms = NULL;
-	gsize _tmp4_ = 0UL;
-	GdkAtom* _tmp5_ = NULL;
-	gint atoms_length1 = 0;
-	gint _atoms_size_ = 0;
-	GdkAtom* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	guchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
+	gsize _tmp4_;
+	GdkAtom* _tmp5_;
+	gint atoms_length1;
+	gint _atoms_size_;
+	GdkAtom* _tmp6_;
+	gint _tmp6__length1;
+	guchar* _tmp7_;
+	gint _tmp8_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp9_ = NULL;
-	GdkAtom* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	GeeArrayList* _tmp9_;
+	GdkAtom* _tmp10_;
+	gint _tmp10__length1;
 #line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
 #line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1838,7 +1838,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		_tmp1_ = TRUE;
 #line 1840 "misc.c"
 	} else {
-		guchar* _tmp3_ = NULL;
+		guchar* _tmp3_;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1900,16 +1900,16 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 #line 1901 "misc.c"
 			{
 				MediaSource* media = NULL;
-				MediaCollectionRegistry* _tmp11_ = NULL;
-				MediaCollectionRegistry* _tmp12_ = NULL;
-				GdkAtom _tmp13_ = 0U;
-				gchar* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				MediaSource* _tmp16_ = NULL;
-				MediaSource* _tmp17_ = NULL;
-				MediaSource* _tmp18_ = NULL;
-				GeeArrayList* _tmp19_ = NULL;
-				MediaSource* _tmp20_ = NULL;
+				MediaCollectionRegistry* _tmp11_;
+				MediaCollectionRegistry* _tmp12_;
+				GdkAtom _tmp13_;
+				gchar* _tmp14_;
+				gchar* _tmp15_;
+				MediaSource* _tmp16_;
+				MediaSource* _tmp17_;
+				MediaSource* _tmp18_;
+				GeeArrayList* _tmp19_;
+				MediaSource* _tmp20_;
 #line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = media_collection_registry_get_instance ();
 #line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1959,44 +1959,44 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* result = NULL;
 	gchar* buffer = NULL;
-	gchar* _tmp0_ = NULL;
-	gint buffer_length1 = 0;
-	gint _buffer_size_ = 0;
-	gchar* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 2002 "misc.c"
 }
@@ -2006,20 +2006,20 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	gchar* result = NULL;
 	gchar* from_format = NULL;
 	gchar* to_format = NULL;
-	struct tm _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	struct tm _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	const gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
+	struct tm _tmp0_;
+	gint _tmp1_;
+	struct tm _tmp2_;
+	gint _tmp3_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	const gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	gchar* _tmp27_;
+	gchar* _tmp28_;
 #line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (from_date != NULL, NULL);
 #line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2036,10 +2036,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	if (_tmp1_ == _tmp3_) {
 #line 2038 "misc.c"
 		gboolean _tmp4_ = FALSE;
-		struct tm _tmp5_ = {0};
-		gint _tmp6_ = 0;
-		struct tm _tmp7_ = {0};
-		gint _tmp8_ = 0;
+		struct tm _tmp5_;
+		gint _tmp6_;
+		struct tm _tmp7_;
+		gint _tmp8_;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = *from_date;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2051,10 +2051,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp6_ == _tmp8_) {
 #line 2054 "misc.c"
-			struct tm _tmp9_ = {0};
-			gint _tmp10_ = 0;
-			struct tm _tmp11_ = {0};
-			gint _tmp12_ = 0;
+			struct tm _tmp9_;
+			gint _tmp10_;
+			struct tm _tmp11_;
+			gint _tmp12_;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = *from_date;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2074,8 +2074,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp4_) {
 #line 2077 "misc.c"
-			gchar* _tmp13_ = NULL;
-			gchar* _tmp14_ = NULL;
+			gchar* _tmp13_;
+			gchar* _tmp14_;
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp13_ = resources_get_start_multiday_span_format_string ();
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2090,8 +2090,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			to_format = _tmp14_;
 #line 2092 "misc.c"
 		} else {
-			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
 #line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = resources_get_start_multimonth_span_format_string ();
 #line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2107,8 +2107,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 #line 2108 "misc.c"
 		}
 	} else {
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
 #line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = resources_get_long_date_format_string ();
 #line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2163,12 +2163,12 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 
 gchar* format_local_date (struct tm* date) {
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 256 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (date != NULL, NULL);
 #line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2197,10 +2197,10 @@ gchar* format_local_date (struct tm* date) {
 
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target) {
 	OneShotScheduler* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	OneShotCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	OneShotCallback _tmp2_;
+	void* _tmp2__target;
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2236,7 +2236,7 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal
 
 gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
 	gboolean result = FALSE;
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
 #line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2268,7 +2268,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
 
 
 void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) {
-	guint _tmp0_ = 0U;
+	guint _tmp0_;
 #line 288 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2276,8 +2276,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
 #line 2279 "misc.c"
-		gint _tmp1_ = 0;
-		guint _tmp2_ = 0U;
+		gint _tmp1_;
+		guint _tmp2_;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = priority;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2290,8 +2290,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 
 
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) {
-	guint _tmp0_ = 0U;
-	gboolean _tmp1_ = FALSE;
+	guint _tmp0_;
+	gboolean _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2306,11 +2306,11 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
 
 void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule) {
 	gboolean _tmp0_ = FALSE;
-	guint _tmp1_ = 0U;
-	guint _tmp3_ = 0U;
-	gint _tmp5_ = 0;
-	guint _tmp6_ = 0U;
-	guint _tmp7_ = 0U;
+	guint _tmp1_;
+	guint _tmp3_;
+	gint _tmp5_;
+	guint _tmp6_;
+	guint _tmp7_;
 #line 297 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2318,7 +2318,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != ((guint) 0)) {
 #line 2321 "misc.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = reschedule;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2340,7 +2340,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp3_ != ((guint) 0)) {
 #line 2343 "misc.c"
-		guint _tmp4_ = 0U;
+		guint _tmp4_;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->scheduled;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2360,8 +2360,8 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 
 
 void one_shot_scheduler_cancel (OneShotScheduler* self) {
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2384,8 +2384,8 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 
 static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
 	gboolean result = FALSE;
-	OneShotCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	OneShotCallback _tmp0_;
+	void* _tmp0__target;
 #line 315 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
 #line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2446,7 +2446,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
 #line 2449 "misc.c"
-		OneShotScheduler* object;
+		OneShotScheduler * object;
 		object = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2473,7 +2473,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
 
 
 static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	OneShotScheduler** object_p;
+	OneShotScheduler ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
@@ -2525,7 +2525,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
 
 
 void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
-	OneShotScheduler* old;
+	OneShotScheduler * old;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2556,7 +2556,7 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
 
 
 void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
-	OneShotScheduler* old;
+	OneShotScheduler * old;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2606,7 +2606,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
 }
 
 
-static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
+static void one_shot_scheduler_finalize (OneShotScheduler * obj) {
 	OneShotScheduler * self;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler);
@@ -2635,7 +2635,7 @@ GType one_shot_scheduler_get_type (void) {
 
 
 gpointer one_shot_scheduler_ref (gpointer instance) {
-	OneShotScheduler* self;
+	OneShotScheduler * self;
 	self = instance;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2646,7 +2646,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
 
 
 void one_shot_scheduler_unref (gpointer instance) {
-	OneShotScheduler* self;
+	OneShotScheduler * self;
 	self = instance;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2661,8 +2661,8 @@ void one_shot_scheduler_unref (gpointer instance) {
 
 OpTimer* op_timer_construct (GType object_type, const gchar* name) {
 	OpTimer* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2689,7 +2689,7 @@ OpTimer* op_timer_new (const gchar* name) {
 
 
 void op_timer_start (OpTimer* self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
 #line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2702,15 +2702,15 @@ void op_timer_start (OpTimer* self) {
 
 void op_timer_stop (OpTimer* self) {
 	gdouble time = 0.0;
-	GTimer* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	glong _tmp10_ = 0L;
+	GTimer* _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	glong _tmp10_;
 #line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
 #line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2732,7 +2732,7 @@ void op_timer_stop (OpTimer* self) {
 #line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp4_ < _tmp5_) {
 #line 2735 "misc.c"
-		gdouble _tmp6_ = 0.0;
+		gdouble _tmp6_;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = time;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2746,7 +2746,7 @@ void op_timer_stop (OpTimer* self) {
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ > _tmp8_) {
 #line 2749 "misc.c"
-		gdouble _tmp9_ = 0.0;
+		gdouble _tmp9_;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = time;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2763,7 +2763,7 @@ void op_timer_stop (OpTimer* self) {
 
 gchar* op_timer_to_string (OpTimer* self) {
 	gchar* result = NULL;
-	glong _tmp0_ = 0L;
+	glong _tmp0_;
 #line 353 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_OP_TIMER (self), NULL);
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2771,14 +2771,14 @@ gchar* op_timer_to_string (OpTimer* self) {
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ > ((glong) 0)) {
 #line 2774 "misc.c"
-		const gchar* _tmp1_ = NULL;
-		glong _tmp2_ = 0L;
-		gdouble _tmp3_ = 0.0;
-		gdouble _tmp4_ = 0.0;
-		gdouble _tmp5_ = 0.0;
-		glong _tmp6_ = 0L;
-		gdouble _tmp7_ = 0.0;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp1_;
+		glong _tmp2_;
+		gdouble _tmp3_;
+		gdouble _tmp4_;
+		gdouble _tmp5_;
+		glong _tmp6_;
+		gdouble _tmp7_;
+		gchar* _tmp8_;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = self->priv->name;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2801,8 +2801,8 @@ gchar* op_timer_to_string (OpTimer* self) {
 		return result;
 #line 2803 "misc.c"
 	} else {
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = self->priv->name;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2858,7 +2858,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
 #line 2861 "misc.c"
-		OpTimer* object;
+		OpTimer * object;
 		object = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2885,7 +2885,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	OpTimer** object_p;
+	OpTimer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
@@ -2937,7 +2937,7 @@ gpointer value_get_op_timer (const GValue* value) {
 
 
 void value_set_op_timer (GValue* value, gpointer v_object) {
-	OpTimer* old;
+	OpTimer * old;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2968,7 +2968,7 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
 
 
 void value_take_op_timer (GValue* value, gpointer v_object) {
-	OpTimer* old;
+	OpTimer * old;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3008,7 +3008,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
 
 
 static void op_timer_instance_init (OpTimer * self) {
-	GTimer* _tmp0_ = NULL;
+	GTimer* _tmp0_;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv = OP_TIMER_GET_PRIVATE (self);
 #line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3029,7 +3029,7 @@ static void op_timer_instance_init (OpTimer * self) {
 }
 
 
-static void op_timer_finalize (OpTimer* obj) {
+static void op_timer_finalize (OpTimer * obj) {
 	OpTimer * self;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer);
@@ -3058,7 +3058,7 @@ GType op_timer_get_type (void) {
 
 
 gpointer op_timer_ref (gpointer instance) {
-	OpTimer* self;
+	OpTimer * self;
 	self = instance;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3069,7 +3069,7 @@ gpointer op_timer_ref (gpointer instance) {
 
 
 void op_timer_unref (gpointer instance) {
-	OpTimer* self;
+	OpTimer * self;
 	self = instance;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {