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

1 files changed, 267 insertions, 267 deletions

diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index f34e451..a6cb235 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.36.6, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,27 +263,27 @@ GQuark photo_format_error_quark (void);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1);
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1);
-static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value);
+static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value);
 PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1);
 static gboolean ___lambda4_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write (PhotoFileFormat self);
 static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1);
-static gboolean ___lambda22_ (PhotoFileFormat format);
+static gboolean ___lambda24_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_image (PhotoFileFormat self);
-static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1);
-static gboolean ___lambda23_ (PhotoFileFormat format);
+static gboolean ___lambda25_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_metadata (PhotoFileFormat self);
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
 static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1);
 PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 gboolean is_string_empty (const gchar* s);
 gpointer photo_file_format_driver_ref (gpointer instance);
 void photo_file_format_driver_unref (gpointer instance);
@@ -373,7 +373,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
 gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1);
 gchar** photo_file_format_get_editable_mime_types (int* result_length1);
-static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value);
 enum  {
 	PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
 };
@@ -386,7 +386,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo
 static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath);
 static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options);
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
 	PHOTO_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY
@@ -406,7 +406,7 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper
 static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self);
 GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void photo_file_format_properties_finalize (PhotoFileFormatProperties * 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);
 
@@ -416,7 +416,7 @@ GQuark photo_format_error_quark (void) {
 }
 
 
-static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value) {
+static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -434,13 +434,13 @@ static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size,
 PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1) {
 	PhotoFileFormat* result = NULL;
 	PhotoFileFormat* applicable = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint applicable_length1 = 0;
-	gint _applicable_size_ = 0;
-	gint _tmp1_ = 0;
-	PhotoFileFormat* _tmp2_ = NULL;
-	PhotoFileFormat* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint applicable_length1;
+	gint _applicable_size_;
+	gint _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	PhotoFileFormat* _tmp8_;
+	gint _tmp8__length1;
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (PhotoFileFormat, 0);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -469,10 +469,10 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 			format = format_collection[format_it];
 #line 471 "PhotoFileFormat.c"
 			{
-				PhotoFileFormatDataApplicableTest _tmp3_ = NULL;
-				void* _tmp3__target = NULL;
-				PhotoFileFormat _tmp4_ = 0;
-				gboolean _tmp5_ = FALSE;
+				PhotoFileFormatDataApplicableTest _tmp3_;
+				void* _tmp3__target;
+				PhotoFileFormat _tmp4_;
+				gboolean _tmp5_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp3_ = test;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -484,9 +484,9 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				if (_tmp5_) {
 #line 487 "PhotoFileFormat.c"
-					PhotoFileFormat* _tmp6_ = NULL;
-					gint _tmp6__length1 = 0;
-					PhotoFileFormat _tmp7_ = 0;
+					PhotoFileFormat* _tmp6_;
+					gint _tmp6__length1;
+					PhotoFileFormat _tmp7_;
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 					_tmp6_ = applicable;
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -523,8 +523,8 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 
 static gboolean ___lambda4_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -555,14 +555,14 @@ static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_writeable;
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -570,8 +570,8 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 573 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp2_ = photo_file_format_data_find_applicable (____lambda4__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -610,10 +610,10 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 }
 
 
-static gboolean ___lambda22_ (PhotoFileFormat format) {
+static gboolean ___lambda24_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -626,9 +626,9 @@ static gboolean ___lambda22_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda22_ (format);
+	result = ___lambda24_ (format);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 635 "PhotoFileFormat.c"
@@ -644,14 +644,14 @@ static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_image_writeable;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -659,10 +659,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 662 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda22__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -699,10 +699,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 }
 
 
-static gboolean ___lambda23_ (PhotoFileFormat format) {
+static gboolean ___lambda25_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
-	PhotoFileFormat _tmp0_ = 0;
-	gboolean _tmp1_ = FALSE;
+	PhotoFileFormat _tmp0_;
+	gboolean _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = format;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -715,9 +715,9 @@ static gboolean ___lambda23_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda23_ (format);
+	result = ___lambda25_ (format);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 724 "PhotoFileFormat.c"
@@ -733,14 +733,14 @@ static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) {
 
 PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PhotoFileFormat* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PhotoFileFormat* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PhotoFileFormat* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	gint _tmp0__length1;
+	PhotoFileFormat* _tmp3_;
+	gint _tmp3__length1;
+	PhotoFileFormat* _tmp4_;
+	gint _tmp4__length1;
+	PhotoFileFormat* _tmp5_;
+	gint _tmp5__length1;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_data_metadata_writeable;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -748,10 +748,10 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp0_ == NULL) {
 #line 751 "PhotoFileFormat.c"
-		gint _tmp1_ = 0;
-		PhotoFileFormat* _tmp2_ = NULL;
+		gint _tmp1_;
+		PhotoFileFormat* _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda25__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -790,9 +790,9 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	PhotoFileFormat* _tmp0_ = NULL;
-	PhotoFileFormat* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PhotoFileFormat* _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	gint _tmp1__length1;
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (PhotoFileFormat, 5);
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -825,10 +825,10 @@ PhotoFileFormat* photo_file_format_get_supported (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_writeable (&_tmp0_);
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -851,10 +851,10 @@ PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_image_writeable (&_tmp0_);
 #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -877,10 +877,10 @@ PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) {
 
 PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) {
 	PhotoFileFormat* result = NULL;
-	gint _tmp0_ = 0;
-	PhotoFileFormat* _tmp1_ = NULL;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PhotoFileFormat* _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gint _tmp2__length1;
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_data_get_metadata_writeable (&_tmp0_);
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -905,13 +905,13 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 	PhotoFileFormat result = 0;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
-	PhotoFileFormat* _tmp6_ = NULL;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
+	PhotoFileFormat* _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (basename != NULL, 0);
 #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -962,14 +962,14 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 			file_format = file_format_collection[file_format_it];
 #line 964 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp7_ = 0;
-				PhotoFileFormatDriver* _tmp8_ = NULL;
-				PhotoFileFormatDriver* _tmp9_ = NULL;
-				PhotoFileFormatProperties* _tmp10_ = NULL;
-				PhotoFileFormatProperties* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				gboolean _tmp14_ = FALSE;
+				PhotoFileFormat _tmp7_;
+				PhotoFileFormatDriver* _tmp8_;
+				PhotoFileFormatDriver* _tmp9_;
+				PhotoFileFormatProperties* _tmp10_;
+				PhotoFileFormatProperties* _tmp11_;
+				const gchar* _tmp12_;
+				gboolean _tmp13_;
+				gboolean _tmp14_;
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp7_ = file_format;
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1024,11 +1024,11 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 
 gboolean photo_file_format_is_file_supported (GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1055,13 +1055,13 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) {
 	gboolean result = FALSE;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gint _tmp5_ = 0;
-	PhotoFileFormat* _tmp6_ = NULL;
+	const gchar* _tmp3_;
+	gboolean _tmp4_;
+	gint _tmp5_;
+	PhotoFileFormat* _tmp6_;
 #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
 #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1112,14 +1112,14 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) {
 			format = format_collection[format_it];
 #line 1114 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp7_ = 0;
-				PhotoFileFormatDriver* _tmp8_ = NULL;
-				PhotoFileFormatDriver* _tmp9_ = NULL;
-				PhotoFileFormatProperties* _tmp10_ = NULL;
-				PhotoFileFormatProperties* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gboolean _tmp13_ = FALSE;
-				gboolean _tmp14_ = FALSE;
+				PhotoFileFormat _tmp7_;
+				PhotoFileFormatDriver* _tmp8_;
+				PhotoFileFormatDriver* _tmp9_;
+				PhotoFileFormatProperties* _tmp10_;
+				PhotoFileFormatProperties* _tmp11_;
+				const gchar* _tmp12_;
+				gboolean _tmp13_;
+				gboolean _tmp14_;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp7_ = format;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1184,11 +1184,11 @@ PhotoFileFormat photo_file_format_get_system_default_format (void) {
 
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file) {
 	PhotoFileFormat result = 0;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PhotoFileFormat _tmp3_ = 0;
-	PhotoFileFormat _tmp4_ = 0;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PhotoFileFormat _tmp3_;
+	PhotoFileFormat _tmp4_;
 #line 119 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1282,7 +1282,7 @@ gint photo_file_format_serialize (PhotoFileFormat self) {
 
 PhotoFileFormat photo_file_format_unserialize (gint value) {
 	PhotoFileFormat result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = value;
 #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1351,8 +1351,8 @@ PhotoFileFormat photo_file_format_unserialize (gint value) {
 
 PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) {
 	PhotoFileFormat result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 170 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (type != NULL, 0);
@@ -1447,8 +1447,8 @@ PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) {
 
 PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name) {
 	PhotoFileFormat result = 0;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	static GQuark _tmp2_label0 = 0;
@@ -1610,7 +1610,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_JFIF:
 #line 1612 "PhotoFileFormat.c"
 		{
-			JfifFileFormatDriver* _tmp0_ = NULL;
+			JfifFileFormatDriver* _tmp0_;
 #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp0_ = jfif_file_format_driver_get_instance ();
 #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1623,7 +1623,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_RAW:
 #line 1625 "PhotoFileFormat.c"
 		{
-			RawFileFormatDriver* _tmp1_ = NULL;
+			RawFileFormatDriver* _tmp1_;
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp1_ = raw_file_format_driver_get_instance ();
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1636,7 +1636,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_PNG:
 #line 1638 "PhotoFileFormat.c"
 		{
-			PngFileFormatDriver* _tmp2_ = NULL;
+			PngFileFormatDriver* _tmp2_;
 #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp2_ = png_file_format_driver_get_instance ();
 #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1649,7 +1649,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_TIFF:
 #line 1651 "PhotoFileFormat.c"
 		{
-			PhotosTiffFileFormatDriver* _tmp3_ = NULL;
+			PhotosTiffFileFormatDriver* _tmp3_;
 #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp3_ = photos_tiff_file_format_driver_get_instance ();
 #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1662,7 +1662,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 		case PHOTO_FILE_FORMAT_BMP:
 #line 1664 "PhotoFileFormat.c"
 		{
-			PhotosBmpFileFormatDriver* _tmp4_ = NULL;
+			PhotosBmpFileFormatDriver* _tmp4_;
 #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			_tmp4_ = photos_bmp_file_format_driver_get_instance ();
 #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1686,10 +1686,10 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self
 
 PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self) {
 	PhotoFileFormatProperties* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
 #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1710,13 +1710,13 @@ PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat sel
 
 gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotoFileFormatProperties* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	PhotoFileFormatProperties* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 268 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1747,11 +1747,11 @@ gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar
 
 PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath) {
 	PhotoFileReader* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileReader* _tmp3_ = NULL;
-	PhotoFileReader* _tmp4_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileReader* _tmp3_;
+	PhotoFileReader* _tmp4_;
 #line 272 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1777,13 +1777,13 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc
 gboolean photo_file_format_can_write (PhotoFileFormat self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp1_ = photo_file_format_can_write_image (self);
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp1_) {
 #line 1786 "PhotoFileFormat.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp2_ = photo_file_format_can_write_metadata (self);
 #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1804,10 +1804,10 @@ gboolean photo_file_format_can_write (PhotoFileFormat self) {
 
 gboolean photo_file_format_can_write_image (PhotoFileFormat self) {
 	gboolean result = FALSE;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1828,10 +1828,10 @@ gboolean photo_file_format_can_write_image (PhotoFileFormat self) {
 
 gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) {
 	gboolean result = FALSE;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1853,12 +1853,12 @@ gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) {
 PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error) {
 	PhotoFileWriter* result = NULL;
 	PhotoFileWriter* writer = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileWriter* _tmp3_ = NULL;
-	PhotoFileWriter* _tmp4_ = NULL;
-	PhotoFileWriter* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileWriter* _tmp3_;
+	PhotoFileWriter* _tmp4_;
+	PhotoFileWriter* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 289 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
@@ -1882,7 +1882,7 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc
 	if (_tmp5_ == NULL) {
 #line 1884 "PhotoFileFormat.c"
 		GEnumValue* _tmp6_;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self);
 #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1921,12 +1921,12 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc
 PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error) {
 	PhotoFileMetadataWriter* result = NULL;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PhotoFileMetadataWriter* _tmp3_ = NULL;
-	PhotoFileMetadataWriter* _tmp4_ = NULL;
-	PhotoFileMetadataWriter* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	const gchar* _tmp2_;
+	PhotoFileMetadataWriter* _tmp3_;
+	PhotoFileMetadataWriter* _tmp4_;
+	PhotoFileMetadataWriter* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
@@ -1950,7 +1950,7 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm
 	if (_tmp5_ == NULL) {
 #line 1952 "PhotoFileFormat.c"
 		GEnumValue* _tmp6_;
-		GError* _tmp7_ = NULL;
+		GError* _tmp7_;
 #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self);
 #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -1988,12 +1988,12 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm
 
 PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options) {
 	PhotoFileSniffer* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	PhotoFileSnifferOptions _tmp3_ = 0;
-	PhotoFileSniffer* _tmp4_ = NULL;
-	PhotoFileSniffer* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	GFile* _tmp2_;
+	PhotoFileSnifferOptions _tmp3_;
+	PhotoFileSniffer* _tmp4_;
+	PhotoFileSniffer* _tmp5_;
 #line 305 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2020,10 +2020,10 @@ PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile*
 
 PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) {
 	PhotoMetadata* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoMetadata* _tmp2_ = NULL;
-	PhotoMetadata* _tmp3_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoMetadata* _tmp2_;
+	PhotoMetadata* _tmp3_;
 #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2044,12 +2044,12 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) {
 
 gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) {
 	gchar* result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2076,16 +2076,16 @@ gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) {
 
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1) {
 	gchar** result = NULL;
-	PhotoFileFormatDriver* _tmp0_ = NULL;
-	PhotoFileFormatDriver* _tmp1_ = NULL;
-	PhotoFileFormatProperties* _tmp2_ = NULL;
-	PhotoFileFormatProperties* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	PhotoFileFormatDriver* _tmp0_;
+	PhotoFileFormatDriver* _tmp1_;
+	PhotoFileFormatProperties* _tmp2_;
+	PhotoFileFormatProperties* _tmp3_;
+	gint _tmp4_;
+	gchar** _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = photo_file_format_get_driver (self);
 #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2122,7 +2122,7 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng
 }
 
 
-static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2142,13 +2142,13 @@ static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* va
 gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 	gchar** result = NULL;
 	gchar** mime_types = NULL;
-	gchar** _tmp0_ = NULL;
-	gint mime_types_length1 = 0;
-	gint _mime_types_size_ = 0;
-	gint _tmp1_ = 0;
-	PhotoFileFormat* _tmp2_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar** _tmp0_;
+	gint mime_types_length1;
+	gint _mime_types_size_;
+	gint _tmp1_;
+	PhotoFileFormat* _tmp2_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
 #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2177,9 +2177,9 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 			file_format = file_format_collection[file_format_it];
 #line 2179 "PhotoFileFormat.c"
 			{
-				PhotoFileFormat _tmp3_ = 0;
-				gint _tmp4_ = 0;
-				gchar** _tmp5_ = NULL;
+				PhotoFileFormat _tmp3_;
+				gint _tmp4_;
+				gchar** _tmp5_;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 				_tmp3_ = file_format;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2197,7 +2197,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 					for (mime_type_it = 0; mime_type_it < _tmp4_; mime_type_it = mime_type_it + 1) {
 #line 2200 "PhotoFileFormat.c"
-						gchar* _tmp6_ = NULL;
+						gchar* _tmp6_;
 						gchar* mime_type = NULL;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 						_tmp6_ = g_strdup (mime_type_collection[mime_type_it]);
@@ -2205,10 +2205,10 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 						mime_type = _tmp6_;
 #line 2207 "PhotoFileFormat.c"
 						{
-							gchar** _tmp7_ = NULL;
-							gint _tmp7__length1 = 0;
-							const gchar* _tmp8_ = NULL;
-							gchar* _tmp9_ = NULL;
+							gchar** _tmp7_;
+							gint _tmp7__length1;
+							const gchar* _tmp8_;
+							gchar* _tmp9_;
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 							_tmp7_ = mime_types;
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2462,7 +2462,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
 #line 2465 "PhotoFileFormat.c"
-		PhotoFileFormatDriver* object;
+		PhotoFileFormatDriver * object;
 		object = collect_values[0].v_pointer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2489,7 +2489,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint
 
 
 static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileFormatDriver** object_p;
+	PhotoFileFormatDriver ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!object_p) {
@@ -2541,7 +2541,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) {
 
 
 void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
-	PhotoFileFormatDriver* old;
+	PhotoFileFormatDriver * old;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER));
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2572,7 +2572,7 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_format_driver (GValue* value, gpointer v_object) {
-	PhotoFileFormatDriver* old;
+	PhotoFileFormatDriver * old;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER));
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2606,21 +2606,21 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = photo_file_format_driver_finalize;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_get_properties;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_reader;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_create_metadata;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_image;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_metadata;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_writer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_metadata_writer;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
 #line 2625 "PhotoFileFormat.c"
 }
 
@@ -2632,7 +2632,7 @@ static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self
 }
 
 
-static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PhotoFileFormatDriver * self;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver);
@@ -2657,7 +2657,7 @@ GType photo_file_format_driver_get_type (void) {
 
 
 gpointer photo_file_format_driver_ref (gpointer instance) {
-	PhotoFileFormatDriver* self;
+	PhotoFileFormatDriver * self;
 	self = instance;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2668,7 +2668,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) {
 
 
 void photo_file_format_driver_unref (gpointer instance) {
-	PhotoFileFormatDriver* self;
+	PhotoFileFormatDriver * self;
 	self = instance;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2731,13 +2731,13 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp
 
 static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (ext != NULL, FALSE);
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2872,23 +2872,23 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 	GFile* result = NULL;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp6_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
+	const gchar* _tmp6_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	GFile* _tmp19_;
+	GFile* _tmp20_;
 #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2916,8 +2916,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp6_ != NULL) {
 #line 2919 "PhotoFileFormat.c"
-		const gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		const gchar* _tmp7_;
+		gboolean _tmp8_;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp7_ = ext;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2933,8 +2933,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp5_) {
 #line 2936 "PhotoFileFormat.c"
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp9_ = file;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3039,7 +3039,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
 #line 3042 "PhotoFileFormat.c"
-		PhotoFileFormatProperties* object;
+		PhotoFileFormatProperties * object;
 		object = collect_values[0].v_pointer;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -3066,7 +3066,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g
 
 
 static gchar* value_photo_file_format_properties_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PhotoFileFormatProperties** object_p;
+	PhotoFileFormatProperties ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!object_p) {
@@ -3118,7 +3118,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) {
 
 
 void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
-	PhotoFileFormatProperties* old;
+	PhotoFileFormatProperties * old;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES));
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3149,7 +3149,7 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
 
 
 void value_take_photo_file_format_properties (GValue* value, gpointer v_object) {
-	PhotoFileFormatProperties* old;
+	PhotoFileFormatProperties * old;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES));
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -3183,21 +3183,21 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = photo_file_format_properties_finalize;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_file_format;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_flags;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*)(PhotoFileFormatProperties*, const gchar*)) photo_file_format_properties_real_is_recognized_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*) (PhotoFileFormatProperties *, const gchar*)) photo_file_format_properties_real_is_recognized_extension;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_extension;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_known_extensions;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_mime_type;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_mime_types;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_user_visible_name;
 #line 3202 "PhotoFileFormat.c"
 }
 
@@ -3209,7 +3209,7 @@ static void photo_file_format_properties_instance_init (PhotoFileFormatPropertie
 }
 
 
-static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PhotoFileFormatProperties * self;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
@@ -3234,7 +3234,7 @@ GType photo_file_format_properties_get_type (void) {
 
 
 gpointer photo_file_format_properties_ref (gpointer instance) {
-	PhotoFileFormatProperties* self;
+	PhotoFileFormatProperties * self;
 	self = instance;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -3245,7 +3245,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) {
 
 
 void photo_file_format_properties_unref (gpointer instance) {
-	PhotoFileFormatProperties* self;
+	PhotoFileFormatProperties * self;
 	self = instance;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {