Merge branch 'feature/upstream' into develop

1 files changed, 153 insertions, 156 deletions

diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 1fcbfa7..4962cb8 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.7, the Vala compiler
+/* TiffSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -545,7 +545,7 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file
 GType gdk_sniffer_get_type (void) G_GNUC_CONST;
 GType photos_tiff_sniffer_get_type (void) G_GNUC_CONST;
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
-static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj);
+static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 enum  {
@@ -563,7 +563,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho
 static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
 static gchar** _vala_array_dup17 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
-static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj);
+static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
 void detected_photo_information_unref (gpointer instance);
 GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -607,7 +607,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
 
 
 void photos_tiff_file_format_driver_init (void) {
-	PhotosTiffFileFormatDriver* _tmp0_ = NULL;
+	PhotosTiffFileFormatDriver* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_driver_new ();
 #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -629,8 +629,8 @@ static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 
 PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
 	PhotosTiffFileFormatDriver* result = NULL;
-	PhotosTiffFileFormatDriver* _tmp0_ = NULL;
-	PhotosTiffFileFormatDriver* _tmp1_ = NULL;
+	PhotosTiffFileFormatDriver* _tmp0_;
+	PhotosTiffFileFormatDriver* _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_driver_instance;
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -646,7 +646,7 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
 static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -662,8 +662,8 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper
 static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffReader* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffReader* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -683,7 +683,7 @@ static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (Photo
 static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
-	PhotoMetadata* _tmp0_ = NULL;
+	PhotoMetadata* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -725,8 +725,8 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil
 static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffWriter* _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -746,8 +746,8 @@ static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (Photo
 static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	PhotosTiffMetadataWriter* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PhotosTiffMetadataWriter* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -767,9 +767,9 @@ static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metad
 static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
-	PhotosTiffSniffer* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
+	PhotosTiffSniffer* _tmp2_;
 #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
 #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -811,21 +811,21 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = photos_tiff_file_format_driver_finalize;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_get_properties;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_reader;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_create_metadata;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_image;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_metadata;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_writer;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer;
 #line 830 "TiffSupport.c"
 }
 
@@ -834,7 +834,7 @@ static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDr
 }
 
 
-static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
+static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	PhotosTiffFileFormatDriver * self;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver);
@@ -857,7 +857,7 @@ GType photos_tiff_file_format_driver_get_type (void) {
 
 
 void photos_tiff_file_format_properties_init (void) {
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_properties_new ();
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -877,8 +877,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) {
 	PhotosTiffFileFormatProperties* result = NULL;
-	PhotosTiffFileFormatProperties* _tmp0_ = NULL;
-	PhotosTiffFileFormatProperties* _tmp1_ = NULL;
+	PhotosTiffFileFormatProperties* _tmp0_;
+	PhotosTiffFileFormatProperties* _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_properties_instance;
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -920,7 +920,7 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P
 static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 81 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -936,19 +936,16 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho
 static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = _ ("TIFF");
+	_tmp0_ = g_strdup (_ ("TIFF"));
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 952 "TiffSupport.c"
+#line 949 "TiffSupport.c"
 }
 
 
@@ -959,29 +956,29 @@ static gchar** _vala_array_dup16 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 963 "TiffSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 960 "TiffSupport.c"
+		gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result[i] = _tmp0_;
-#line 969 "TiffSupport.c"
+#line 966 "TiffSupport.c"
 	}
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 973 "TiffSupport.c"
+#line 970 "TiffSupport.c"
 }
 
 
 static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 89 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1000,23 +997,23 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho
 	if (result_length1) {
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1004 "TiffSupport.c"
+#line 1001 "TiffSupport.c"
 	}
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = _tmp2_;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1010 "TiffSupport.c"
+#line 1007 "TiffSupport.c"
 }
 
 
 static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 93 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1031,7 +1028,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1035 "TiffSupport.c"
+#line 1032 "TiffSupport.c"
 }
 
 
@@ -1042,29 +1039,29 @@ static gchar** _vala_array_dup17 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1046 "TiffSupport.c"
-		gchar* _tmp0_ = NULL;
+#line 1043 "TiffSupport.c"
+		gchar* _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result[i] = _tmp0_;
-#line 1052 "TiffSupport.c"
+#line 1049 "TiffSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1056 "TiffSupport.c"
+#line 1053 "TiffSupport.c"
 }
 
 
 static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 #line 97 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1083,13 +1080,13 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile
 	if (result_length1) {
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1087 "TiffSupport.c"
+#line 1084 "TiffSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1093 "TiffSupport.c"
+#line 1090 "TiffSupport.c"
 }
 
 
@@ -1099,41 +1096,41 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GT
 	self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1103 "TiffSupport.c"
+#line 1100 "TiffSupport.c"
 }
 
 
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) {
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_file_format_properties_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES);
-#line 1110 "TiffSupport.c"
+#line 1107 "TiffSupport.c"
 }
 
 
 static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) {
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_parent_class = g_type_class_peek_parent (klass);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_tiff_file_format_properties_finalize;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_file_format;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_flags;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_extension;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_user_visible_name;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_known_extensions;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_mime_type;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_mime_types;
 #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = g_strdup ("tif");
 #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1158,7 +1155,7 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP
 	photos_tiff_file_format_properties_KNOWN_MIME_TYPES = _tmp4_;
 #line 59 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 1162 "TiffSupport.c"
+#line 1159 "TiffSupport.c"
 }
 
 
@@ -1166,13 +1163,13 @@ static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileForm
 }
 
 
-static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj) {
+static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
 	PhotosTiffFileFormatProperties * self;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_tiff_file_format_properties_parent_class)->finalize (obj);
-#line 1176 "TiffSupport.c"
+#line 1173 "TiffSupport.c"
 }
 
 
@@ -1190,8 +1187,8 @@ GType photos_tiff_file_format_properties_get_type (void) {
 
 PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
 	PhotosTiffSniffer* self = NULL;
-	GFile* _tmp0_ = NULL;
-	PhotoFileSnifferOptions _tmp1_ = 0;
+	GFile* _tmp0_;
+	PhotoFileSnifferOptions _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1202,21 +1199,21 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file
 	self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1206 "TiffSupport.c"
+#line 1203 "TiffSupport.c"
 }
 
 
 PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_sniffer_construct (PHOTOS_TYPE_TIFF_SNIFFER, file, options);
-#line 1213 "TiffSupport.c"
+#line 1210 "TiffSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1220 "TiffSupport.c"
+#line 1217 "TiffSupport.c"
 }
 
 
@@ -1225,16 +1222,16 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	GFile* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
 	gboolean _tmp3_ = FALSE;
-	DetectedPhotoInformation* _tmp4_ = NULL;
-	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp4_;
+	DetectedPhotoInformation* _tmp5_;
 	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_ = NULL;
-	PhotoFileFormat _tmp8_ = 0;
-	DetectedPhotoInformation* _tmp10_ = NULL;
+	DetectedPhotoInformation* _tmp7_;
+	PhotoFileFormat _tmp8_;
+	DetectedPhotoInformation* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_SNIFFER, PhotosTiffSniffer);
@@ -1252,7 +1249,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		g_propagate_error (error, _inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1256 "TiffSupport.c"
+#line 1253 "TiffSupport.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (!_tmp0_) {
@@ -1262,11 +1259,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		if (is_corrupted) {
 #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1266 "TiffSupport.c"
+#line 1263 "TiffSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1270 "TiffSupport.c"
+#line 1267 "TiffSupport.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1280,7 +1277,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		g_propagate_error (error, _inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1284 "TiffSupport.c"
+#line 1281 "TiffSupport.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp5_ = detected;
@@ -1294,11 +1291,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 		if (is_corrupted) {
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1298 "TiffSupport.c"
+#line 1295 "TiffSupport.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1302 "TiffSupport.c"
+#line 1299 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp7_ = detected;
@@ -1306,17 +1303,17 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	_tmp8_ = _tmp7_->file_format;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) {
-#line 1310 "TiffSupport.c"
-		DetectedPhotoInformation* _tmp9_ = NULL;
+#line 1307 "TiffSupport.c"
+		DetectedPhotoInformation* _tmp9_;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp9_ = detected;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1316 "TiffSupport.c"
+#line 1313 "TiffSupport.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_tmp6_ = NULL;
-#line 1320 "TiffSupport.c"
+#line 1317 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1328,11 +1325,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 	if (is_corrupted) {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1332 "TiffSupport.c"
+#line 1329 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1336 "TiffSupport.c"
+#line 1333 "TiffSupport.c"
 }
 
 
@@ -1340,8 +1337,8 @@ static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) {
 #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
-#line 1345 "TiffSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
+#line 1342 "TiffSupport.c"
 }
 
 
@@ -1363,7 +1360,7 @@ GType photos_tiff_sniffer_get_type (void) {
 
 PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffReader* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1372,21 +1369,21 @@ PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar*
 	self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1376 "TiffSupport.c"
+#line 1373 "TiffSupport.c"
 }
 
 
 PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) {
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_reader_construct (PHOTOS_TYPE_TIFF_READER, filepath);
-#line 1383 "TiffSupport.c"
+#line 1380 "TiffSupport.c"
 }
 
 
 static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) {
 #line 122 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_reader_parent_class = g_type_class_peek_parent (klass);
-#line 1390 "TiffSupport.c"
+#line 1387 "TiffSupport.c"
 }
 
 
@@ -1408,7 +1405,7 @@ GType photos_tiff_reader_get_type (void) {
 
 PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1417,22 +1414,22 @@ PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar*
 	self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1421 "TiffSupport.c"
+#line 1418 "TiffSupport.c"
 }
 
 
 PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) {
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_writer_construct (PHOTOS_TYPE_TIFF_WRITER, filepath);
-#line 1428 "TiffSupport.c"
+#line 1425 "TiffSupport.c"
 }
 
 
 static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
 	PhotosTiffWriter * self;
-	GdkPixbuf* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GdkPixbuf* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_WRITER, PhotosTiffWriter);
@@ -1454,7 +1451,7 @@ static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pix
 		g_propagate_error (error, _inner_error_);
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1458 "TiffSupport.c"
+#line 1455 "TiffSupport.c"
 	}
 }
 
@@ -1463,8 +1460,8 @@ static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) {
 #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_writer_parent_class = g_type_class_peek_parent (klass);
 #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
-#line 1468 "TiffSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
+#line 1465 "TiffSupport.c"
 }
 
 
@@ -1486,7 +1483,7 @@ GType photos_tiff_writer_get_type (void) {
 
 PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) {
 	PhotosTiffMetadataWriter* self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1495,22 +1492,22 @@ PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_ty
 	self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1499 "TiffSupport.c"
+#line 1496 "TiffSupport.c"
 }
 
 
 PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) {
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_metadata_writer_construct (PHOTOS_TYPE_TIFF_METADATA_WRITER, filepath);
-#line 1506 "TiffSupport.c"
+#line 1503 "TiffSupport.c"
 }
 
 
 static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
 	PhotosTiffMetadataWriter * self;
-	PhotoMetadata* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	PhotoMetadata* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_METADATA_WRITER, PhotosTiffMetadataWriter);
@@ -1532,7 +1529,7 @@ static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWr
 		g_propagate_error (error, _inner_error_);
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1536 "TiffSupport.c"
+#line 1533 "TiffSupport.c"
 	}
 }
 
@@ -1541,8 +1538,8 @@ static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClas
 #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
-#line 1546 "TiffSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
+#line 1543 "TiffSupport.c"
 }
 
 
@@ -1565,22 +1562,22 @@ GType photos_tiff_metadata_writer_get_type (void) {
 gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) {
 	gboolean result = FALSE;
 	GFileInputStream* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFileInputStream* _tmp2_ = NULL;
+	GFile* _tmp1_;
+	GFileInputStream* _tmp2_;
 	GDataInputStream* dins = NULL;
-	GDataInputStream* _tmp4_ = NULL;
+	GDataInputStream* _tmp4_;
 	GDataStreamByteOrder order = 0;
 	guint16 _tmp5_ = 0U;
-	GDataInputStream* _tmp6_ = NULL;
-	GCancellable* _tmp7_ = NULL;
-	guint16 _tmp8_ = 0U;
-	GDataInputStream* _tmp10_ = NULL;
-	GDataStreamByteOrder _tmp11_ = 0;
+	GDataInputStream* _tmp6_;
+	GCancellable* _tmp7_;
+	guint16 _tmp8_;
+	GDataInputStream* _tmp10_;
+	GDataStreamByteOrder _tmp11_;
 	guint16 lue = 0U;
-	GDataInputStream* _tmp12_ = NULL;
-	GCancellable* _tmp13_ = NULL;
-	guint16 _tmp14_ = 0U;
-	guint16 _tmp16_ = 0U;
+	GDataInputStream* _tmp12_;
+	GCancellable* _tmp13_;
+	guint16 _tmp14_;
+	guint16 _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1594,13 +1591,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_tmp0_ = _tmp2_;
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1598 "TiffSupport.c"
+#line 1595 "TiffSupport.c"
 		gboolean _tmp3_ = FALSE;
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp3_;
-#line 1604 "TiffSupport.c"
+#line 1601 "TiffSupport.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
@@ -1616,7 +1613,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_tmp5_ = _tmp8_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1620 "TiffSupport.c"
+#line 1617 "TiffSupport.c"
 		gboolean _tmp9_ = FALSE;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1626,29 +1623,29 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp9_;
-#line 1630 "TiffSupport.c"
+#line 1627 "TiffSupport.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	switch (_tmp5_) {
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4949:
-#line 1636 "TiffSupport.c"
+#line 1633 "TiffSupport.c"
 		{
 #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN;
 #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			break;
-#line 1642 "TiffSupport.c"
+#line 1639 "TiffSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4D4D:
-#line 1646 "TiffSupport.c"
+#line 1643 "TiffSupport.c"
 		{
 #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN;
 #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			break;
-#line 1652 "TiffSupport.c"
+#line 1649 "TiffSupport.c"
 		}
 		default:
 		{
@@ -1660,7 +1657,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 			_g_object_unref0 (_tmp0_);
 #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 			return result;
-#line 1664 "TiffSupport.c"
+#line 1661 "TiffSupport.c"
 		}
 	}
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1679,7 +1676,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	lue = _tmp14_;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1683 "TiffSupport.c"
+#line 1680 "TiffSupport.c"
 		gboolean _tmp15_ = FALSE;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1689,7 +1686,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return _tmp15_;
-#line 1693 "TiffSupport.c"
+#line 1690 "TiffSupport.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp16_ = lue;
@@ -1703,7 +1700,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 		_g_object_unref0 (_tmp0_);
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1707 "TiffSupport.c"
+#line 1704 "TiffSupport.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = TRUE;
@@ -1713,7 +1710,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	_g_object_unref0 (_tmp0_);
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1717 "TiffSupport.c"
+#line 1714 "TiffSupport.c"
 }