Merge branch 'feature/upstream' into develop

1 files changed, 470 insertions, 325 deletions

diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 70e930b..d17a83b 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.36.6, the Vala compiler
+/* TiffSupport.c generated by valac 0.40.4, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -471,31 +472,55 @@ static gpointer photos_tiff_metadata_writer_parent_class = NULL;
 
 gpointer photo_file_format_driver_ref (gpointer instance);
 void photo_file_format_driver_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_driver (GValue* value, gpointer v_object);
-void value_take_photo_file_format_driver (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_format_driver (const gchar* name,
+                                                 const gchar* nick,
+                                                 const gchar* blurb,
+                                                 GType object_type,
+                                                 GParamFlags flags);
+void value_set_photo_file_format_driver (GValue* value,
+                                         gpointer v_object);
+void value_take_photo_file_format_driver (GValue* value,
+                                          gpointer v_object);
 gpointer value_get_photo_file_format_driver (const GValue* value);
 GType photo_file_format_driver_get_type (void) G_GNUC_CONST;
 gpointer photo_file_format_properties_ref (gpointer instance);
 void photo_file_format_properties_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
-void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_format_properties (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void value_set_photo_file_format_properties (GValue* value,
+                                             gpointer v_object);
+void value_take_photo_file_format_properties (GValue* value,
+                                              gpointer v_object);
 gpointer value_get_photo_file_format_properties (const GValue* value);
 GType photo_file_format_properties_get_type (void) G_GNUC_CONST;
 gpointer photo_file_adapter_ref (gpointer instance);
 void photo_file_adapter_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_adapter (GValue* value, gpointer v_object);
-void value_take_photo_file_adapter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_adapter (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_photo_file_adapter (GValue* value,
+                                   gpointer v_object);
+void value_take_photo_file_adapter (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_photo_file_adapter (const GValue* value);
 GType photo_file_adapter_get_type (void) G_GNUC_CONST;
 GType photo_file_reader_get_type (void) G_GNUC_CONST;
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+                               gpointer v_object);
+void value_take_media_metadata (GValue* value,
+                                gpointer v_object);
 gpointer value_get_media_metadata (const GValue* value);
 GType media_metadata_get_type (void) G_GNUC_CONST;
 GType photo_metadata_get_type (void) G_GNUC_CONST;
@@ -504,15 +529,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST;
 GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST;
 gpointer photo_file_sniffer_ref (gpointer instance);
 void photo_file_sniffer_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_sniffer (GValue* value, gpointer v_object);
-void value_take_photo_file_sniffer (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_sniffer (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_photo_file_sniffer (GValue* value,
+                                   gpointer v_object);
+void value_take_photo_file_sniffer (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_photo_file_sniffer (const GValue* value);
 GType photo_file_sniffer_get_type (void) G_GNUC_CONST;
 GType photos_tiff_file_format_driver_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_TIFF_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
-};
 void photos_tiff_file_format_driver_init (void);
 PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void);
 PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type);
@@ -521,9 +549,11 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void);
 static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base);
 GType photos_tiff_file_format_properties_get_type (void) G_GNUC_CONST;
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void);
-static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath);
+static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                                                    const gchar* filepath);
 PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath);
-PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath);
+PhotosTiffReader* photos_tiff_reader_construct (GType object_type,
+                                                const gchar* filepath);
 GType gdk_reader_get_type (void) G_GNUC_CONST;
 GType photos_tiff_reader_get_type (void) G_GNUC_CONST;
 static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base);
@@ -531,82 +561,109 @@ PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
 static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base);
 static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base);
-static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath);
+static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                                                    const gchar* filepath);
 PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath);
-PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath);
+PhotosTiffWriter* photos_tiff_writer_construct (GType object_type,
+                                                const gchar* filepath);
 GType photos_tiff_writer_get_type (void) G_GNUC_CONST;
-static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath);
+static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                                                     const gchar* filepath);
 PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath);
-PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath);
+PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type,
+                                                                 const gchar* filepath);
 GType photos_tiff_metadata_writer_get_type (void) G_GNUC_CONST;
-static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options);
-PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options);
-PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
+static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                                                      GFile* file,
+                                                                      PhotoFileSnifferOptions options);
+PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file,
+                                            PhotoFileSnifferOptions options);
+PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type,
+                                                  GFile* file,
+                                                  PhotoFileSnifferOptions options);
 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);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_TIFF_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY
-};
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void);
 PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type);
 static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base);
 static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base);
 static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
-static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup14 (gchar** self, int length);
+static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                                      int* result_length1);
+static gchar** _vala_array_dup14 (gchar** self,
+                           int length);
 static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
-static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup15 (gchar** self, int length);
+static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                                int* result_length1);
+static gchar** _vala_array_dup15 (gchar** self,
+                           int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 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);
-void value_set_detected_photo_information (GValue* value, gpointer v_object);
-void value_take_detected_photo_information (GValue* value, gpointer v_object);
+GParamSpec* param_spec_detected_photo_information (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void value_set_detected_photo_information (GValue* value,
+                                           gpointer v_object);
+void value_take_detected_photo_information (GValue* value,
+                                            gpointer v_object);
 gpointer value_get_detected_photo_information (const GValue* value);
 GType detected_photo_information_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_TIFF_SNIFFER_DUMMY_PROPERTY
-};
-GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
-static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error);
-gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error);
-DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error);
+GdkSniffer* gdk_sniffer_construct (GType object_type,
+                                   GFile* file,
+                                   PhotoFileSnifferOptions options);
+static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base,
+                                                          gboolean* is_corrupted,
+                                                          GError** error);
+gboolean photos_is_tiff (GFile* file,
+                         GCancellable* cancellable,
+                         GError** error);
+DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self,
+                                                    gboolean* is_corrupted,
+                                                    GError** error);
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
-enum  {
-	PHOTOS_TIFF_READER_DUMMY_PROPERTY
-};
-GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
+GdkReader* gdk_reader_construct (GType object_type,
+                                 const gchar* filepath,
+                                 PhotoFileFormat file_format);
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_TIFF_WRITER_DUMMY_PROPERTY
-};
 #define PHOTOS_TIFF_WRITER_COMPRESSION_NONE "1"
 #define PHOTOS_TIFF_WRITER_COMPRESSION_HUFFMAN "2"
 #define PHOTOS_TIFF_WRITER_COMPRESSION_LZW "5"
 #define PHOTOS_TIFF_WRITER_COMPRESSION_JPEG "7"
 #define PHOTOS_TIFF_WRITER_COMPRESSION_DEFLATE "8"
-PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error);
+PhotoFileWriter* photo_file_writer_construct (GType object_type,
+                                              const gchar* filepath,
+                                              PhotoFileFormat file_format);
+static void photos_tiff_writer_real_write (PhotoFileWriter* base,
+                                    GdkPixbuf* pixbuf,
+                                    JpegQuality quality,
+                                    GError** error);
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self);
-enum  {
-	PHOTOS_TIFF_METADATA_WRITER_DUMMY_PROPERTY
-};
-PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error);
-void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error);
+PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type,
+                                                               const gchar* filepath,
+                                                               PhotoFileFormat file_format);
+static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base,
+                                                      PhotoMetadata* metadata,
+                                                      GError** error);
+void photo_metadata_write_to_file (PhotoMetadata* self,
+                                   GFile* file,
+                                   GError** error);
 GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
 
 
-void photos_tiff_file_format_driver_init (void) {
+void
+photos_tiff_file_format_driver_init (void)
+{
 	PhotosTiffFileFormatDriver* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_driver_new ();
@@ -616,18 +673,22 @@ void photos_tiff_file_format_driver_init (void) {
 	photos_tiff_file_format_driver_instance = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_init ();
-#line 620 "TiffSupport.c"
+#line 677 "TiffSupport.c"
 }
 
 
-static gpointer _photo_file_format_driver_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_driver_ref0 (gpointer self)
+{
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 627 "TiffSupport.c"
+#line 686 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
+PhotosTiffFileFormatDriver*
+photos_tiff_file_format_driver_get_instance (void)
+{
 	PhotosTiffFileFormatDriver* result = NULL;
 	PhotosTiffFileFormatDriver* _tmp0_;
 	PhotosTiffFileFormatDriver* _tmp1_;
@@ -639,11 +700,13 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 643 "TiffSupport.c"
+#line 704 "TiffSupport.c"
 }
 
 
-static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
+static PhotoFileFormatProperties*
+photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
 	PhotosTiffFileFormatProperties* _tmp0_;
@@ -655,32 +718,34 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 659 "TiffSupport.c"
+#line 722 "TiffSupport.c"
 }
 
 
-static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileReader*
+photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                                   const gchar* filepath)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_;
-	PhotosTiffReader* _tmp1_;
+	PhotosTiffReader* _tmp0_;
 #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"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = filepath;
-#line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = photos_tiff_reader_new (_tmp0_);
+	_tmp0_ = photos_tiff_reader_new (filepath);
 #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 680 "TiffSupport.c"
+#line 743 "TiffSupport.c"
 }
 
 
-static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
+static PhotoMetadata*
+photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* _tmp0_;
@@ -692,11 +757,13 @@ static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (Photo
 	result = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 696 "TiffSupport.c"
+#line 761 "TiffSupport.c"
 }
 
 
-static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) {
+static gboolean
+photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base)
+{
 	PhotosTiffFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 33 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -705,11 +772,13 @@ static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFo
 	result = TRUE;
 #line 34 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 709 "TiffSupport.c"
+#line 776 "TiffSupport.c"
 }
 
 
-static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) {
+static gboolean
+photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base)
+{
 	PhotosTiffFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 37 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -718,94 +787,98 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil
 	result = TRUE;
 #line 38 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 722 "TiffSupport.c"
+#line 791 "TiffSupport.c"
 }
 
 
-static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileWriter*
+photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                                   const gchar* filepath)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_;
-	PhotosTiffWriter* _tmp1_;
+	PhotosTiffWriter* _tmp0_;
 #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"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = filepath;
-#line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = photos_tiff_writer_new (_tmp0_);
+	_tmp0_ = photos_tiff_writer_new (filepath);
 #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
 #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 743 "TiffSupport.c"
+#line 812 "TiffSupport.c"
 }
 
 
-static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileMetadataWriter*
+photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                            const gchar* filepath)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_;
-	PhotosTiffMetadataWriter* _tmp1_;
+	PhotosTiffMetadataWriter* _tmp0_;
 #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"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = filepath;
-#line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = photos_tiff_metadata_writer_new (_tmp0_);
+	_tmp0_ = photos_tiff_metadata_writer_new (filepath);
 #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
 #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 764 "TiffSupport.c"
+#line 833 "TiffSupport.c"
 }
 
 
-static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
+static PhotoFileSniffer*
+photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                                    GFile* file,
+                                                    PhotoFileSnifferOptions options)
+{
 	PhotosTiffFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_;
-	PhotoFileSnifferOptions _tmp1_;
-	PhotosTiffSniffer* _tmp2_;
+	PhotosTiffSniffer* _tmp0_;
 #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"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = file;
+	_tmp0_ = photos_tiff_sniffer_new (file, options);
 #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = options;
-#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp2_ = photos_tiff_sniffer_new (_tmp0_, _tmp1_);
-#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 788 "TiffSupport.c"
+#line 855 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type) {
+PhotosTiffFileFormatDriver*
+photos_tiff_file_format_driver_construct (GType object_type)
+{
 	PhotosTiffFileFormatDriver* self = NULL;
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = (PhotosTiffFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 798 "TiffSupport.c"
+#line 867 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void) {
+PhotosTiffFileFormatDriver*
+photos_tiff_file_format_driver_new (void)
+{
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return photos_tiff_file_format_driver_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER);
-#line 805 "TiffSupport.c"
+#line 876 "TiffSupport.c"
 }
 
 
-static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass) {
+static void
+photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_driver_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -826,25 +899,31 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive
 	((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;
-#line 830 "TiffSupport.c"
+#line 903 "TiffSupport.c"
 }
 
 
-static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self) {
+static void
+photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self)
+{
 }
 
 
-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);
 #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_tiff_file_format_driver_parent_class)->finalize (obj);
-#line 844 "TiffSupport.c"
+#line 921 "TiffSupport.c"
 }
 
 
-GType photos_tiff_file_format_driver_get_type (void) {
+GType
+photos_tiff_file_format_driver_get_type (void)
+{
 	static volatile gsize photos_tiff_file_format_driver_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_file_format_driver_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatDriver), 0, (GInstanceInitFunc) photos_tiff_file_format_driver_instance_init, NULL };
@@ -856,7 +935,9 @@ GType photos_tiff_file_format_driver_get_type (void) {
 }
 
 
-void photos_tiff_file_format_properties_init (void) {
+void
+photos_tiff_file_format_properties_init (void)
+{
 	PhotosTiffFileFormatProperties* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0_ = photos_tiff_file_format_properties_new ();
@@ -864,18 +945,22 @@ void photos_tiff_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (photos_tiff_file_format_properties_instance);
 #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	photos_tiff_file_format_properties_instance = _tmp0_;
-#line 868 "TiffSupport.c"
+#line 949 "TiffSupport.c"
 }
 
 
-static gpointer _photo_file_format_properties_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_properties_ref0 (gpointer self)
+{
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 875 "TiffSupport.c"
+#line 958 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) {
+PhotosTiffFileFormatProperties*
+photos_tiff_file_format_properties_get_instance (void)
+{
 	PhotosTiffFileFormatProperties* result = NULL;
 	PhotosTiffFileFormatProperties* _tmp0_;
 	PhotosTiffFileFormatProperties* _tmp1_;
@@ -887,11 +972,13 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance
 	result = _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 891 "TiffSupport.c"
+#line 976 "TiffSupport.c"
 }
 
 
-static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) {
+static PhotoFileFormat
+photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base)
+{
 	PhotosTiffFileFormatProperties * self;
 	PhotoFileFormat result = 0;
 #line 73 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -900,11 +987,13 @@ static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (
 	result = PHOTO_FILE_FORMAT_TIFF;
 #line 74 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 904 "TiffSupport.c"
+#line 991 "TiffSupport.c"
 }
 
 
-static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) {
+static PhotoFileFormatFlags
+photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base)
+{
 	PhotosTiffFileFormatProperties * self;
 	PhotoFileFormatFlags result = 0;
 #line 77 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -913,11 +1002,13 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 78 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 917 "TiffSupport.c"
+#line 1006 "TiffSupport.c"
 }
 
 
-static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
+static gchar*
+photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base)
+{
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -929,11 +1020,13 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho
 	result = _tmp0_;
 #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 933 "TiffSupport.c"
+#line 1024 "TiffSupport.c"
 }
 
 
-static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
+static gchar*
+photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base)
+{
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -945,32 +1038,38 @@ static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (Pho
 	result = _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 949 "TiffSupport.c"
+#line 1042 "TiffSupport.c"
 }
 
 
-static gchar** _vala_array_dup14 (gchar** self, int length) {
+static gchar**
+_vala_array_dup14 (gchar** self,
+                   int length)
+{
 	gchar** result;
 	int i;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 960 "TiffSupport.c"
+#line 1056 "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 966 "TiffSupport.c"
+#line 1062 "TiffSupport.c"
 	}
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 970 "TiffSupport.c"
+#line 1066 "TiffSupport.c"
 }
 
 
-static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                              int* result_length1)
+{
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -997,17 +1096,19 @@ 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 1001 "TiffSupport.c"
+#line 1100 "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 1007 "TiffSupport.c"
+#line 1106 "TiffSupport.c"
 }
 
 
-static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
+static gchar*
+photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base)
+{
 	PhotosTiffFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar** _tmp0_;
@@ -1028,32 +1129,38 @@ 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 1032 "TiffSupport.c"
+#line 1133 "TiffSupport.c"
 }
 
 
-static gchar** _vala_array_dup15 (gchar** self, int length) {
+static gchar**
+_vala_array_dup15 (gchar** self,
+                   int length)
+{
 	gchar** result;
 	int i;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1043 "TiffSupport.c"
+#line 1147 "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 1049 "TiffSupport.c"
+#line 1153 "TiffSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1053 "TiffSupport.c"
+#line 1157 "TiffSupport.c"
 }
 
 
-static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                        int* result_length1)
+{
 	PhotosTiffFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -1080,34 +1187,40 @@ 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 1084 "TiffSupport.c"
+#line 1191 "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 1090 "TiffSupport.c"
+#line 1197 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type) {
+PhotosTiffFileFormatProperties*
+photos_tiff_file_format_properties_construct (GType object_type)
+{
 	PhotosTiffFileFormatProperties* self = NULL;
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1100 "TiffSupport.c"
+#line 1209 "TiffSupport.c"
 }
 
 
-PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) {
+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 1107 "TiffSupport.c"
+#line 1218 "TiffSupport.c"
 }
 
 
-static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) {
+static void
+photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar** _tmp2_;
@@ -1155,25 +1268,31 @@ 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 1159 "TiffSupport.c"
+#line 1272 "TiffSupport.c"
 }
 
 
-static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self) {
+static void
+photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self)
+{
 }
 
 
-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 1173 "TiffSupport.c"
+#line 1290 "TiffSupport.c"
 }
 
 
-GType photos_tiff_file_format_properties_get_type (void) {
+GType
+photos_tiff_file_format_properties_get_type (void)
+{
 	static volatile gsize photos_tiff_file_format_properties_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_file_format_properties_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatProperties), 0, (GInstanceInitFunc) photos_tiff_file_format_properties_instance_init, NULL };
@@ -1185,53 +1304,59 @@ GType photos_tiff_file_format_properties_get_type (void) {
 }
 
 
-PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
+PhotosTiffSniffer*
+photos_tiff_sniffer_construct (GType object_type,
+                               GFile* file,
+                               PhotoFileSnifferOptions options)
+{
 	PhotosTiffSniffer* self = NULL;
-	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"
-	_tmp0_ = file;
-#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = options;
-#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
+	self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, file, options);
 #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1203 "TiffSupport.c"
+#line 1320 "TiffSupport.c"
 }
 
 
-PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
+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 1210 "TiffSupport.c"
+#line 1330 "TiffSupport.c"
 }
 
 
-static gpointer _detected_photo_information_ref0 (gpointer self) {
+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 1217 "TiffSupport.c"
+#line 1339 "TiffSupport.c"
 }
 
 
-static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) {
+static DetectedPhotoInformation*
+photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base,
+                                gboolean* is_corrupted,
+                                GError** error)
+{
 	PhotosTiffSniffer * self;
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
-	gboolean _tmp2_;
 	DetectedPhotoInformation* detected = NULL;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	DetectedPhotoInformation* _tmp3_;
 	DetectedPhotoInformation* _tmp4_;
-	DetectedPhotoInformation* _tmp5_;
-	DetectedPhotoInformation* _tmp6_ = NULL;
-	DetectedPhotoInformation* _tmp7_;
-	PhotoFileFormat _tmp8_;
-	DetectedPhotoInformation* _tmp10_;
+	DetectedPhotoInformation* _tmp5_ = NULL;
+	DetectedPhotoInformation* _tmp6_;
+	PhotoFileFormat _tmp7_;
+	DetectedPhotoInformation* _tmp9_;
 	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);
@@ -1240,16 +1365,14 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp2_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_);
-#line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = _tmp2_;
+	_tmp0_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1253 "TiffSupport.c"
+#line 1376 "TiffSupport.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (!_tmp0_) {
@@ -1259,30 +1382,30 @@ 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 1263 "TiffSupport.c"
+#line 1386 "TiffSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1267 "TiffSupport.c"
+#line 1390 "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_);
+	_tmp3_ = 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), &_tmp2_, &_inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_vala_is_corrupted = _tmp3_;
+	_vala_is_corrupted = _tmp2_;
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	detected = _tmp4_;
+	detected = _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return NULL;
-#line 1281 "TiffSupport.c"
+#line 1404 "TiffSupport.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp5_ = detected;
+	_tmp4_ = detected;
 #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result = NULL;
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1291,62 +1414,68 @@ 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 1295 "TiffSupport.c"
+#line 1418 "TiffSupport.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return result;
-#line 1299 "TiffSupport.c"
+#line 1422 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp7_ = detected;
+	_tmp6_ = detected;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp8_ = _tmp7_->file_format;
+	_tmp7_ = _tmp6_->file_format;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) {
-#line 1307 "TiffSupport.c"
-		DetectedPhotoInformation* _tmp9_;
+	if (_tmp7_ == PHOTO_FILE_FORMAT_TIFF) {
+#line 1430 "TiffSupport.c"
+		DetectedPhotoInformation* _tmp8_;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		_tmp9_ = detected;
+		_tmp8_ = detected;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		_tmp6_ = _tmp9_;
-#line 1313 "TiffSupport.c"
+		_tmp5_ = _tmp8_;
+#line 1436 "TiffSupport.c"
 	} else {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		_tmp6_ = NULL;
-#line 1317 "TiffSupport.c"
+		_tmp5_ = NULL;
+#line 1440 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
+	_tmp9_ = _detected_photo_information_ref0 (_tmp5_);
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	result = _tmp10_;
+	result = _tmp9_;
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_detected_photo_information_unref0 (detected);
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (is_corrupted) {
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1329 "TiffSupport.c"
+#line 1452 "TiffSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return result;
-#line 1333 "TiffSupport.c"
+#line 1456 "TiffSupport.c"
 }
 
 
-static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) {
+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 1342 "TiffSupport.c"
+#line 1467 "TiffSupport.c"
 }
 
 
-static void photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self) {
+static void
+photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self)
+{
 }
 
 
-GType photos_tiff_sniffer_get_type (void) {
+GType
+photos_tiff_sniffer_get_type (void)
+{
 	static volatile gsize photos_tiff_sniffer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_sniffer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffSniffer), 0, (GInstanceInitFunc) photos_tiff_sniffer_instance_init, NULL };
@@ -1358,40 +1487,48 @@ GType photos_tiff_sniffer_get_type (void) {
 }
 
 
-PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) {
+PhotosTiffReader*
+photos_tiff_reader_construct (GType object_type,
+                              const gchar* filepath)
+{
 	PhotosTiffReader* self = 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"
-	_tmp0_ = filepath;
-#line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
+	self = (PhotosTiffReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF);
 #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1373 "TiffSupport.c"
+#line 1502 "TiffSupport.c"
 }
 
 
-PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) {
+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 1380 "TiffSupport.c"
+#line 1511 "TiffSupport.c"
 }
 
 
-static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) {
+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 1387 "TiffSupport.c"
+#line 1520 "TiffSupport.c"
 }
 
 
-static void photos_tiff_reader_instance_init (PhotosTiffReader * self) {
+static void
+photos_tiff_reader_instance_init (PhotosTiffReader * self)
+{
 }
 
 
-GType photos_tiff_reader_get_type (void) {
+GType
+photos_tiff_reader_get_type (void)
+{
 	static volatile gsize photos_tiff_reader_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_reader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffReader), 0, (GInstanceInitFunc) photos_tiff_reader_instance_init, NULL };
@@ -1403,73 +1540,83 @@ GType photos_tiff_reader_get_type (void) {
 }
 
 
-PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) {
+PhotosTiffWriter*
+photos_tiff_writer_construct (GType object_type,
+                              const gchar* filepath)
+{
 	PhotosTiffWriter* self = 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"
-	_tmp0_ = filepath;
-#line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
+	self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF);
 #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1418 "TiffSupport.c"
+#line 1555 "TiffSupport.c"
 }
 
 
-PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) {
+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 1425 "TiffSupport.c"
+#line 1564 "TiffSupport.c"
 }
 
 
-static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
+static void
+photos_tiff_writer_real_write (PhotoFileWriter* base,
+                               GdkPixbuf* pixbuf,
+                               JpegQuality quality,
+                               GError** error)
+{
 	PhotosTiffWriter * self;
-	GdkPixbuf* _tmp0_;
+	gchar* _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);
 #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = pixbuf;
-#line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	gdk_pixbuf_save (_tmp0_, _tmp2_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL);
+	gdk_pixbuf_save (pixbuf, _tmp1_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL);
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1455 "TiffSupport.c"
+#line 1596 "TiffSupport.c"
 	}
 }
 
 
-static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) {
+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 1465 "TiffSupport.c"
+#line 1608 "TiffSupport.c"
 }
 
 
-static void photos_tiff_writer_instance_init (PhotosTiffWriter * self) {
+static void
+photos_tiff_writer_instance_init (PhotosTiffWriter * self)
+{
 }
 
 
-GType photos_tiff_writer_get_type (void) {
+GType
+photos_tiff_writer_get_type (void)
+{
 	static volatile gsize photos_tiff_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffWriter), 0, (GInstanceInitFunc) photos_tiff_writer_instance_init, NULL };
@@ -1481,73 +1628,82 @@ GType photos_tiff_writer_get_type (void) {
 }
 
 
-PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) {
+PhotosTiffMetadataWriter*
+photos_tiff_metadata_writer_construct (GType object_type,
+                                       const gchar* filepath)
+{
 	PhotosTiffMetadataWriter* self = 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"
-	_tmp0_ = filepath;
-#line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF);
+	self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF);
 #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	return self;
-#line 1496 "TiffSupport.c"
+#line 1643 "TiffSupport.c"
 }
 
 
-PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) {
+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 1503 "TiffSupport.c"
+#line 1652 "TiffSupport.c"
 }
 
 
-static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
+static void
+photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base,
+                                                 PhotoMetadata* metadata,
+                                                 GError** error)
+{
 	PhotosTiffMetadataWriter * self;
-	PhotoMetadata* _tmp0_;
+	GFile* _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);
 #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = metadata;
-#line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_);
+	photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_);
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		return;
-#line 1533 "TiffSupport.c"
+#line 1683 "TiffSupport.c"
 	}
 }
 
 
-static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass) {
+static void
+photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass)
+{
 #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 1543 "TiffSupport.c"
+#line 1695 "TiffSupport.c"
 }
 
 
-static void photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self) {
+static void
+photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self)
+{
 }
 
 
-GType photos_tiff_metadata_writer_get_type (void) {
+GType
+photos_tiff_metadata_writer_get_type (void)
+{
 	static volatile gsize photos_tiff_metadata_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_tiff_metadata_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffMetadataWriter), 0, (GInstanceInitFunc) photos_tiff_metadata_writer_instance_init, NULL };
@@ -1559,62 +1715,55 @@ GType photos_tiff_metadata_writer_get_type (void) {
 }
 
 
-gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) {
+gboolean
+photos_is_tiff (GFile* file,
+                GCancellable* cancellable,
+                GError** error)
+{
 	gboolean result = FALSE;
 	GFileInputStream* _tmp0_ = NULL;
-	GFile* _tmp1_;
-	GFileInputStream* _tmp2_;
+	GFileInputStream* _tmp1_;
 	GDataInputStream* dins = NULL;
-	GDataInputStream* _tmp4_;
+	GDataInputStream* _tmp3_;
 	GDataStreamByteOrder order = 0;
-	guint16 _tmp5_ = 0U;
-	GDataInputStream* _tmp6_;
-	GCancellable* _tmp7_;
-	guint16 _tmp8_;
-	GDataInputStream* _tmp10_;
-	GDataStreamByteOrder _tmp11_;
+	guint16 _tmp4_ = 0U;
+	GDataInputStream* _tmp5_;
+	GDataInputStream* _tmp7_;
+	GDataStreamByteOrder _tmp8_;
 	guint16 lue = 0U;
-	GDataInputStream* _tmp12_;
-	GCancellable* _tmp13_;
-	guint16 _tmp14_;
-	guint16 _tmp16_;
+	GDataInputStream* _tmp9_;
+	guint16 _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), FALSE);
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = file;
-#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp2_ = g_file_read (_tmp1_, NULL, &_inner_error_);
+	_tmp1_ = g_file_read (file, NULL, &_inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp0_ = _tmp2_;
+	_tmp0_ = _tmp1_;
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1595 "TiffSupport.c"
-		gboolean _tmp3_ = FALSE;
+#line 1748 "TiffSupport.c"
+		gboolean _tmp2_ = 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 1601 "TiffSupport.c"
+		return _tmp2_;
+#line 1754 "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));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	dins = _tmp4_;
+	dins = _tmp3_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp6_ = dins;
+	_tmp5_ = dins;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp7_ = cancellable;
-#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_);
-#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp5_ = _tmp8_;
+	_tmp4_ = g_data_input_stream_read_uint16 (_tmp5_, cancellable, &_inner_error_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1617 "TiffSupport.c"
-		gboolean _tmp9_ = FALSE;
+#line 1766 "TiffSupport.c"
+		gboolean _tmp6_ = FALSE;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1622,30 +1771,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_g_object_unref0 (_tmp0_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		return _tmp9_;
-#line 1627 "TiffSupport.c"
+		return _tmp6_;
+#line 1776 "TiffSupport.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	switch (_tmp5_) {
+	switch (_tmp4_) {
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4949:
-#line 1633 "TiffSupport.c"
+#line 1782 "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 1639 "TiffSupport.c"
+#line 1788 "TiffSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4D4D:
-#line 1643 "TiffSupport.c"
+#line 1792 "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 1649 "TiffSupport.c"
+#line 1798 "TiffSupport.c"
 		}
 		default:
 		{
@@ -1657,27 +1806,23 @@ 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 1661 "TiffSupport.c"
+#line 1810 "TiffSupport.c"
 		}
 	}
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp10_ = dins;
+	_tmp7_ = dins;
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp11_ = order;
+	_tmp8_ = order;
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	g_data_input_stream_set_byte_order (_tmp10_, _tmp11_);
-#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp12_ = dins;
-#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp13_ = cancellable;
+	g_data_input_stream_set_byte_order (_tmp7_, _tmp8_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_);
+	_tmp9_ = dins;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	lue = _tmp14_;
+	lue = g_data_input_stream_read_uint16 (_tmp9_, cancellable, &_inner_error_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1680 "TiffSupport.c"
-		gboolean _tmp15_ = FALSE;
+#line 1825 "TiffSupport.c"
+		gboolean _tmp10_ = FALSE;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1685,13 +1830,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_g_object_unref0 (_tmp0_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		return _tmp15_;
-#line 1690 "TiffSupport.c"
+		return _tmp10_;
+#line 1835 "TiffSupport.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp16_ = lue;
+	_tmp11_ = lue;
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	if (((gint) _tmp16_) != 42) {
+	if (((gint) _tmp11_) != 42) {
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1700,7 +1845,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 1704 "TiffSupport.c"
+#line 1849 "TiffSupport.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = TRUE;
@@ -1710,7 +1855,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 1714 "TiffSupport.c"
+#line 1859 "TiffSupport.c"
 }