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

1 files changed, 279 insertions, 279 deletions

diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c
index 7d21a8d..dd5f414 100644
--- a/plugins/shotwell-data-imports/VersionNumber.c
+++ b/plugins/shotwell-data-imports/VersionNumber.c
@@ -1,4 +1,4 @@
-/* VersionNumber.c generated by valac 0.34.7, the Vala compiler
+/* VersionNumber.c generated by valac 0.36.6, the Vala compiler
  * generated from VersionNumber.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -43,7 +43,7 @@ struct _UtilsVersionNumberPrivate {
 
 
 static gpointer utils_version_number_parent_class = NULL;
-static GeeComparableIface* utils_version_number_gee_comparable_parent_iface = NULL;
+static GeeComparableIface * utils_version_number_gee_comparable_parent_iface = NULL;
 
 GType utils_version_number_get_type (void) G_GNUC_CONST;
 #define UTILS_VERSION_NUMBER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberPrivate))
@@ -57,7 +57,7 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi
 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator);
 gchar* utils_version_number_to_string (UtilsVersionNumber* self);
 static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVersionNumber* other);
-static void utils_version_number_finalize (GObject* obj);
+static void utils_version_number_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -72,10 +72,10 @@ static gint* _vala_array_dup3 (gint* self, int length) {
 
 UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1) {
 	UtilsVersionNumber * self = NULL;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gint* _tmp0_;
+	gint _tmp0__length1;
+	gint* _tmp1_;
+	gint _tmp1__length1;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	self = (UtilsVersionNumber*) g_object_new (object_type, NULL);
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -110,15 +110,15 @@ UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1
 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator) {
 	UtilsVersionNumber * self = NULL;
 	gchar** version_items = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint version_items_length1 = 0;
-	gint _version_items_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gint* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint version_items_length1;
+	gint _version_items_size_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	gint* _tmp5_;
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	g_return_val_if_fail (str_version != NULL, NULL);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -164,22 +164,22 @@ UtilsVersionNumber* utils_version_number_construct_from_string (GType object_typ
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 167 "VersionNumber.c"
-				gint _tmp8_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gint* _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				gchar** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gint _tmp13_ = 0;
-				const gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				gint* _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				gchar** _tmp12_;
+				gint _tmp12__length1;
+				gint _tmp13_;
+				const gchar* _tmp14_;
+				gint _tmp15_;
+				gint _tmp16_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp6_) {
 #line 182 "VersionNumber.c"
-					gint _tmp7_ = 0;
+					gint _tmp7_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp7_ = i;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -241,408 +241,408 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 256 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 266 "VersionNumber.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 276 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 282 "VersionNumber.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 293 "VersionNumber.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 305 "VersionNumber.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 309 "VersionNumber.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 313 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 317 "VersionNumber.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 340 "VersionNumber.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 349 "VersionNumber.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 362 "VersionNumber.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 368 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 378 "VersionNumber.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 390 "VersionNumber.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 394 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 400 "VersionNumber.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 411 "VersionNumber.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 426 "VersionNumber.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 430 "VersionNumber.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 434 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 440 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 452 "VersionNumber.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 473 "VersionNumber.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 477 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 483 "VersionNumber.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 490 "VersionNumber.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 498 "VersionNumber.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 536 "VersionNumber.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 545 "VersionNumber.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 561 "VersionNumber.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 567 "VersionNumber.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 581 "VersionNumber.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 601 "VersionNumber.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 616 "VersionNumber.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 620 "VersionNumber.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 628 "VersionNumber.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 639 "VersionNumber.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 648 "VersionNumber.c"
 	}
@@ -652,14 +652,14 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 gchar* utils_version_number_to_string (UtilsVersionNumber* self) {
 	gchar* result = NULL;
 	gchar** version_items = NULL;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint version_items_length1 = 0;
-	gint _version_items_size_ = 0;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	gchar* _tmp14_ = NULL;
+	gint* _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint version_items_length1;
+	gint _version_items_size_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	gchar* _tmp14_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (self), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -687,22 +687,22 @@ gchar* utils_version_number_to_string (UtilsVersionNumber* self) {
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 690 "VersionNumber.c"
-				gint _tmp4_ = 0;
-				gint* _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				gint* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				gint _tmp4_;
+				gint* _tmp5_;
+				gint _tmp5__length1;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				gint* _tmp8_;
+				gint _tmp8__length1;
+				gint _tmp9_;
+				gint _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp2_) {
 #line 705 "VersionNumber.c"
-					gint _tmp3_ = 0;
+					gint _tmp3_;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp3_ = i;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -769,11 +769,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 	UtilsVersionNumber * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	UtilsVersionNumber* _tmp2_ = NULL;
-	gint* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gint* _tmp1_;
+	gint _tmp1__length1;
+	UtilsVersionNumber* _tmp2_;
+	gint* _tmp3_;
+	gint _tmp3__length1;
 	gint max_len = 0;
 	gint res = 0;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -793,8 +793,8 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	if (_tmp1__length1 > _tmp3__length1) {
 #line 796 "VersionNumber.c"
-		gint* _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gint* _tmp4_;
+		gint _tmp4__length1;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 		_tmp4_ = self->priv->version;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -803,9 +803,9 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 		_tmp0_ = _tmp4__length1;
 #line 805 "VersionNumber.c"
 	} else {
-		UtilsVersionNumber* _tmp5_ = NULL;
-		gint* _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
+		UtilsVersionNumber* _tmp5_;
+		gint* _tmp6_;
+		gint _tmp6__length1;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 		_tmp5_ = other;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -833,26 +833,26 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 836 "VersionNumber.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
+				gint _tmp9_;
+				gint _tmp10_;
 				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				gint* _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gint _tmp12_;
+				gint* _tmp13_;
+				gint _tmp13__length1;
 				gint this_v = 0;
 				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				UtilsVersionNumber* _tmp19_ = NULL;
-				gint* _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
+				gint _tmp18_;
+				UtilsVersionNumber* _tmp19_;
+				gint* _tmp20_;
+				gint _tmp20__length1;
 				gint other_v = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
+				gint _tmp25_;
+				gint _tmp26_;
+				gint _tmp27_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp7_) {
 #line 855 "VersionNumber.c"
-					gint _tmp8_ = 0;
+					gint _tmp8_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp8_ = i;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -880,10 +880,10 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (_tmp12_ < _tmp13__length1) {
 #line 883 "VersionNumber.c"
-					gint* _tmp14_ = NULL;
-					gint _tmp14__length1 = 0;
-					gint _tmp15_ = 0;
-					gint _tmp16_ = 0;
+					gint* _tmp14_;
+					gint _tmp14__length1;
+					gint _tmp15_;
+					gint _tmp16_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp14_ = self->priv->version;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -913,11 +913,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (_tmp18_ < _tmp20__length1) {
 #line 916 "VersionNumber.c"
-					UtilsVersionNumber* _tmp21_ = NULL;
-					gint* _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					gint _tmp23_ = 0;
-					gint _tmp24_ = 0;
+					UtilsVersionNumber* _tmp21_;
+					gint* _tmp22_;
+					gint _tmp22__length1;
+					gint _tmp23_;
+					gint _tmp24_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp21_ = other;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -978,7 +978,7 @@ static void utils_version_number_gee_comparable_interface_init (GeeComparableIfa
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	utils_version_number_gee_comparable_parent_iface = g_type_interface_peek_parent (iface);
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	iface->compare_to = (gint (*)(GeeComparable*, gconstpointer)) utils_version_number_real_compare_to;
+	iface->compare_to = (gint (*) (GeeComparable *, gconstpointer)) utils_version_number_real_compare_to;
 #line 983 "VersionNumber.c"
 }
 
@@ -990,7 +990,7 @@ static void utils_version_number_instance_init (UtilsVersionNumber * self) {
 }
 
 
-static void utils_version_number_finalize (GObject* obj) {
+static void utils_version_number_finalize (GObject * obj) {
 	UtilsVersionNumber * self;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber);