Merge branch 'feature/upstream' into develop

1 files changed, 497 insertions, 330 deletions

diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index e6f204c..b56b3ed 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.36.6, the Vala compiler
+/* BmpSupport.c generated by valac 0.40.4, the Vala compiler
  * generated from BmpSupport.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>
@@ -482,17 +483,20 @@ static PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_instance = NULL;
 
 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;
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType photo_file_format_flags_get_type (void) G_GNUC_CONST;
 GType photos_bmp_file_format_properties_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY
-};
 void photos_bmp_file_format_properties_init (void);
 PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void);
 PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type);
@@ -501,44 +505,73 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P
 static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base);
 static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
-static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup8 (gchar** self, int length);
+static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                                     int* result_length1);
+static gchar** _vala_array_dup8 (gchar** self,
+                          int length);
 static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
-static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup9 (gchar** self, int length);
+static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                               int* result_length1);
+static gchar** _vala_array_dup9 (gchar** self,
+                          int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 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;
 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;
 GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST;
 GType gdk_sniffer_get_type (void) G_GNUC_CONST;
 GType photos_bmp_sniffer_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_SNIFFER_DUMMY_PROPERTY
-};
-PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options);
-PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
-GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
-static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error);
-static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error);
-DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error);
+PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file,
+                                          PhotoFileSnifferOptions options);
+PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type,
+                                                GFile* file,
+                                                PhotoFileSnifferOptions options);
+GdkSniffer* gdk_sniffer_construct (GType object_type,
+                                   GFile* file,
+                                   PhotoFileSnifferOptions options);
+static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file,
+                                         GError** error);
+static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base,
+                                                         gboolean* is_corrupted,
+                                                         GError** error);
+DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self,
+                                                    gboolean* is_corrupted,
+                                                    GError** error);
 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;
@@ -547,65 +580,90 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 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;
 GType gdk_reader_get_type (void) G_GNUC_CONST;
 GType photos_bmp_reader_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_READER_DUMMY_PROPERTY
-};
 PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath);
-PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath);
-GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error);
+PhotosBmpReader* photos_bmp_reader_construct (GType object_type,
+                                              const gchar* filepath);
+GdkReader* gdk_reader_construct (GType object_type,
+                                 const gchar* filepath,
+                                 PhotoFileFormat file_format);
+static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base,
+                                               Dimensions* full,
+                                               Dimensions* scaled,
+                                               GError** error);
 GType scale_constraint_get_type (void) G_GNUC_CONST;
-void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result);
+void dimensions_get_scaled_by_constraint (Dimensions *self,
+                                          gint scale,
+                                          ScaleConstraint constraint,
+                                          Dimensions* result);
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self);
 GType photo_file_writer_get_type (void) G_GNUC_CONST;
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 GType photos_bmp_writer_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_WRITER_DUMMY_PROPERTY
-};
 PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath);
-PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath);
-PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error);
+PhotosBmpWriter* photos_bmp_writer_construct (GType object_type,
+                                              const gchar* filepath);
+PhotoFileWriter* photo_file_writer_construct (GType object_type,
+                                              const gchar* filepath,
+                                              PhotoFileFormat file_format);
+static void photos_bmp_writer_real_write (PhotoFileWriter* base,
+                                   GdkPixbuf* pixbuf,
+                                   JpegQuality quality,
+                                   GError** error);
 GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST;
 GType photos_bmp_metadata_writer_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_METADATA_WRITER_DUMMY_PROPERTY
-};
 PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath);
-PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath);
-PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error);
+PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type,
+                                                               const gchar* filepath);
+PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type,
+                                                               const gchar* filepath,
+                                                               PhotoFileFormat file_format);
+static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base,
+                                                     PhotoMetadata* metadata,
+                                                     GError** error);
 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;
 GType photos_bmp_file_format_driver_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTOS_BMP_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
-};
 void photos_bmp_file_format_driver_init (void);
 PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void);
 PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type);
 PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void);
 static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base);
-static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath);
+static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                                                   const gchar* filepath);
 static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base);
 static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base);
-static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath);
-static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath);
-static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options);
+static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                                                   const gchar* filepath);
+static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                                                    const gchar* filepath);
+static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                                                     GFile* file,
+                                                                     PhotoFileSnifferOptions options);
 static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base);
 PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
@@ -614,7 +672,9 @@ static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj)
 
 static const guint8 PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[2] = {(guint8) 0x42, (guint8) 0x4D};
 
-void photos_bmp_file_format_properties_init (void) {
+void
+photos_bmp_file_format_properties_init (void)
+{
 	PhotosBmpFileFormatProperties* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_properties_new ();
@@ -622,18 +682,22 @@ void photos_bmp_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (photos_bmp_file_format_properties_instance);
 #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_instance = _tmp0_;
-#line 626 "BmpSupport.c"
+#line 686 "BmpSupport.c"
 }
 
 
-static gpointer _photo_file_format_properties_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_properties_ref0 (gpointer self)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 633 "BmpSupport.c"
+#line 695 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (void) {
+PhotosBmpFileFormatProperties*
+photos_bmp_file_format_properties_get_instance (void)
+{
 	PhotosBmpFileFormatProperties* result = NULL;
 	PhotosBmpFileFormatProperties* _tmp0_;
 	PhotosBmpFileFormatProperties* _tmp1_;
@@ -645,11 +709,13 @@ PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (v
 	result = _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 649 "BmpSupport.c"
+#line 713 "BmpSupport.c"
 }
 
 
-static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) {
+static PhotoFileFormat
+photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base)
+{
 	PhotosBmpFileFormatProperties * self;
 	PhotoFileFormat result = 0;
 #line 23 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -658,11 +724,13 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P
 	result = PHOTO_FILE_FORMAT_BMP;
 #line 24 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 662 "BmpSupport.c"
+#line 728 "BmpSupport.c"
 }
 
 
-static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) {
+static PhotoFileFormatFlags
+photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base)
+{
 	PhotosBmpFileFormatProperties * self;
 	PhotoFileFormatFlags result = 0;
 #line 27 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -671,11 +739,13 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 28 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 675 "BmpSupport.c"
+#line 743 "BmpSupport.c"
 }
 
 
-static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
+static gchar*
+photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base)
+{
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -687,11 +757,13 @@ static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (Phot
 	result = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 691 "BmpSupport.c"
+#line 761 "BmpSupport.c"
 }
 
 
-static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
+static gchar*
+photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base)
+{
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar** _tmp0_;
@@ -712,32 +784,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot
 	result = _tmp2_;
 #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 716 "BmpSupport.c"
+#line 788 "BmpSupport.c"
 }
 
 
-static gchar** _vala_array_dup8 (gchar** self, int length) {
+static gchar**
+_vala_array_dup8 (gchar** self,
+                  int length)
+{
 	gchar** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 727 "BmpSupport.c"
+#line 802 "BmpSupport.c"
 		gchar* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		result[i] = _tmp0_;
-#line 733 "BmpSupport.c"
+#line 808 "BmpSupport.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 737 "BmpSupport.c"
+#line 812 "BmpSupport.c"
 }
 
 
-static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                             int* result_length1)
+{
 	PhotosBmpFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -764,17 +842,19 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot
 	if (result_length1) {
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 768 "BmpSupport.c"
+#line 846 "BmpSupport.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _tmp2_;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 774 "BmpSupport.c"
+#line 852 "BmpSupport.c"
 }
 
 
-static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
+static gchar*
+photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base)
+{
 	PhotosBmpFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar** _tmp0_;
@@ -795,32 +875,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot
 	result = _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 799 "BmpSupport.c"
+#line 879 "BmpSupport.c"
 }
 
 
-static gchar** _vala_array_dup9 (gchar** self, int length) {
+static gchar**
+_vala_array_dup9 (gchar** self,
+                  int length)
+{
 	gchar** result;
 	int i;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 810 "BmpSupport.c"
+#line 893 "BmpSupport.c"
 		gchar* _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		result[i] = _tmp0_;
-#line 816 "BmpSupport.c"
+#line 899 "BmpSupport.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 820 "BmpSupport.c"
+#line 903 "BmpSupport.c"
 }
 
 
-static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                       int* result_length1)
+{
 	PhotosBmpFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -847,34 +933,40 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF
 	if (result_length1) {
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 851 "BmpSupport.c"
+#line 937 "BmpSupport.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 857 "BmpSupport.c"
+#line 943 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type) {
+PhotosBmpFileFormatProperties*
+photos_bmp_file_format_properties_construct (GType object_type)
+{
 	PhotosBmpFileFormatProperties* self = NULL;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = (PhotosBmpFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 867 "BmpSupport.c"
+#line 955 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void) {
+PhotosBmpFileFormatProperties*
+photos_bmp_file_format_properties_new (void)
+{
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_file_format_properties_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES);
-#line 874 "BmpSupport.c"
+#line 964 "BmpSupport.c"
 }
 
 
-static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) {
+static void
+photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar** _tmp2_;
@@ -922,25 +1014,31 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro
 	photos_bmp_file_format_properties_KNOWN_MIME_TYPES = _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 926 "BmpSupport.c"
+#line 1018 "BmpSupport.c"
 }
 
 
-static void photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self) {
+static void
+photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self)
+{
 }
 
 
-static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
+static void
+photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj)
+{
 	PhotosBmpFileFormatProperties * self;
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties);
 #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_bmp_file_format_properties_parent_class)->finalize (obj);
-#line 940 "BmpSupport.c"
+#line 1036 "BmpSupport.c"
 }
 
 
-GType photos_bmp_file_format_properties_get_type (void) {
+GType
+photos_bmp_file_format_properties_get_type (void)
+{
 	static volatile gsize photos_bmp_file_format_properties_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_file_format_properties_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatProperties), 0, (GInstanceInitFunc) photos_bmp_file_format_properties_instance_init, NULL };
@@ -952,82 +1050,83 @@ GType photos_bmp_file_format_properties_get_type (void) {
 }
 
 
-PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
+PhotosBmpSniffer*
+photos_bmp_sniffer_construct (GType object_type,
+                              GFile* file,
+                              PhotoFileSnifferOptions options)
+{
 	PhotosBmpSniffer* self = NULL;
-	GFile* _tmp0_;
-	PhotoFileSnifferOptions _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = file;
-#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = options;
-#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
+	self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, file, options);
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 970 "BmpSupport.c"
+#line 1066 "BmpSupport.c"
 }
 
 
-PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
+PhotosBmpSniffer*
+photos_bmp_sniffer_new (GFile* file,
+                        PhotoFileSnifferOptions options)
+{
 #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_sniffer_construct (PHOTOS_TYPE_BMP_SNIFFER, file, options);
-#line 977 "BmpSupport.c"
+#line 1076 "BmpSupport.c"
 }
 
 
-static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
+static gboolean
+photos_bmp_sniffer_is_bmp_file (GFile* file,
+                                GError** error)
+{
 	gboolean result = FALSE;
 	GFileInputStream* instream = NULL;
-	GFile* _tmp0_;
-	GFileInputStream* _tmp1_;
+	GFileInputStream* _tmp0_;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp3_;
+	guint8* _tmp2_;
 	gint file_lead_sequence_length1;
 	gint _file_lead_sequence_size_;
-	GFileInputStream* _tmp4_;
-	guint8* _tmp5_;
-	gint _tmp5__length1;
+	GFileInputStream* _tmp3_;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
 	GError * _inner_error_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = file;
+	_tmp0_ = g_file_read (file, NULL, &_inner_error_);
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_);
-#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	instream = _tmp1_;
+	instream = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1004 "BmpSupport.c"
-		gboolean _tmp2_ = FALSE;
+#line 1103 "BmpSupport.c"
+		gboolean _tmp1_ = FALSE;
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		return _tmp2_;
-#line 1010 "BmpSupport.c"
+		return _tmp1_;
+#line 1109 "BmpSupport.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
+	_tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	file_lead_sequence = _tmp3_;
+	file_lead_sequence = _tmp2_;
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	file_lead_sequence_length1 = G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE);
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_file_lead_sequence_size_ = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp4_ = instream;
+	_tmp3_ = instream;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp5_ = file_lead_sequence;
+	_tmp4_ = file_lead_sequence;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp5__length1 = file_lead_sequence_length1;
+	_tmp4__length1 = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1030 "BmpSupport.c"
-		gboolean _tmp6_ = FALSE;
+#line 1129 "BmpSupport.c"
+		gboolean _tmp5_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1035,62 +1134,62 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (instream);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		return _tmp6_;
-#line 1040 "BmpSupport.c"
+		return _tmp5_;
+#line 1139 "BmpSupport.c"
 	}
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		i = 0;
-#line 1046 "BmpSupport.c"
+#line 1145 "BmpSupport.c"
 		{
-			gboolean _tmp7_ = FALSE;
+			gboolean _tmp6_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-			_tmp7_ = TRUE;
+			_tmp6_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			while (TRUE) {
-#line 1053 "BmpSupport.c"
-				gint _tmp9_;
-				guint8* _tmp10_;
-				gint _tmp10__length1;
-				gint _tmp11_;
-				guint8 _tmp12_;
-				gint _tmp13_;
-				guint8 _tmp14_;
+#line 1152 "BmpSupport.c"
+				gint _tmp8_;
+				guint8* _tmp9_;
+				gint _tmp9__length1;
+				gint _tmp10_;
+				guint8 _tmp11_;
+				gint _tmp12_;
+				guint8 _tmp13_;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (!_tmp7_) {
-#line 1063 "BmpSupport.c"
-					gint _tmp8_;
+				if (!_tmp6_) {
+#line 1162 "BmpSupport.c"
+					gint _tmp7_;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-					_tmp8_ = i;
+					_tmp7_ = i;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-					i = _tmp8_ + 1;
-#line 1069 "BmpSupport.c"
+					i = _tmp7_ + 1;
+#line 1168 "BmpSupport.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp7_ = FALSE;
+				_tmp6_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp9_ = i;
+				_tmp8_ = i;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
+				if (!(_tmp8_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					break;
-#line 1079 "BmpSupport.c"
+#line 1178 "BmpSupport.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp10_ = file_lead_sequence;
+				_tmp9_ = file_lead_sequence;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp10__length1 = file_lead_sequence_length1;
+				_tmp9__length1 = file_lead_sequence_length1;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp11_ = i;
+				_tmp10_ = i;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp12_ = _tmp10_[_tmp11_];
+				_tmp11_ = _tmp9_[_tmp10_];
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp13_ = i;
+				_tmp12_ = i;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp14_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
+				_tmp13_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp12_];
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (_tmp12_ != _tmp14_) {
+				if (_tmp11_ != _tmp13_) {
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					result = FALSE;
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1099,7 +1198,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 					_g_object_unref0 (instream);
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					return result;
-#line 1103 "BmpSupport.c"
+#line 1202 "BmpSupport.c"
 				}
 			}
 		}
@@ -1112,32 +1211,37 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	_g_object_unref0 (instream);
 #line 71 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1116 "BmpSupport.c"
+#line 1215 "BmpSupport.c"
 }
 
 
-static gpointer _detected_photo_information_ref0 (gpointer self) {
+static gpointer
+_detected_photo_information_ref0 (gpointer self)
+{
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1123 "BmpSupport.c"
+#line 1224 "BmpSupport.c"
 }
 
 
-static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) {
+static DetectedPhotoInformation*
+photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base,
+                               gboolean* is_corrupted,
+                               GError** error)
+{
 	PhotosBmpSniffer * 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 74 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_SNIFFER, PhotosBmpSniffer);
@@ -1146,16 +1250,14 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp2_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_);
-#line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = _tmp2_;
+	_tmp0_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_);
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return NULL;
-#line 1159 "BmpSupport.c"
+#line 1261 "BmpSupport.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (!_tmp0_) {
@@ -1165,30 +1267,30 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		if (is_corrupted) {
 #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1169 "BmpSupport.c"
+#line 1271 "BmpSupport.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1173 "BmpSupport.c"
+#line 1275 "BmpSupport.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_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_bmp_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 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_vala_is_corrupted = _tmp3_;
+	_vala_is_corrupted = _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	detected = _tmp4_;
+	detected = _tmp3_;
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return NULL;
-#line 1187 "BmpSupport.c"
+#line 1289 "BmpSupport.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp5_ = detected;
+	_tmp4_ = detected;
 #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		result = NULL;
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1197,62 +1299,68 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
 		if (is_corrupted) {
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1201 "BmpSupport.c"
+#line 1303 "BmpSupport.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1205 "BmpSupport.c"
+#line 1307 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp7_ = detected;
+	_tmp6_ = detected;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp8_ = _tmp7_->file_format;
+	_tmp7_ = _tmp6_->file_format;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	if (_tmp8_ == PHOTO_FILE_FORMAT_BMP) {
-#line 1213 "BmpSupport.c"
-		DetectedPhotoInformation* _tmp9_;
+	if (_tmp7_ == PHOTO_FILE_FORMAT_BMP) {
+#line 1315 "BmpSupport.c"
+		DetectedPhotoInformation* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		_tmp9_ = detected;
+		_tmp8_ = detected;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		_tmp6_ = _tmp9_;
-#line 1219 "BmpSupport.c"
+		_tmp5_ = _tmp8_;
+#line 1321 "BmpSupport.c"
 	} else {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		_tmp6_ = NULL;
-#line 1223 "BmpSupport.c"
+		_tmp5_ = NULL;
+#line 1325 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
+	_tmp9_ = _detected_photo_information_ref0 (_tmp5_);
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	result = _tmp10_;
+	result = _tmp9_;
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_detected_photo_information_unref0 (detected);
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (is_corrupted) {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1235 "BmpSupport.c"
+#line 1337 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1239 "BmpSupport.c"
+#line 1341 "BmpSupport.c"
 }
 
 
-static void photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) {
+static void
+photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass)
+{
 #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_bmp_sniffer_real_sniff;
-#line 1248 "BmpSupport.c"
+#line 1352 "BmpSupport.c"
 }
 
 
-static void photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self) {
+static void
+photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self)
+{
 }
 
 
-GType photos_bmp_sniffer_get_type (void) {
+GType
+photos_bmp_sniffer_get_type (void)
+{
 	static volatile gsize photos_bmp_sniffer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_sniffer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpSniffer), 0, (GInstanceInitFunc) photos_bmp_sniffer_instance_init, NULL };
@@ -1264,29 +1372,36 @@ GType photos_bmp_sniffer_get_type (void) {
 }
 
 
-PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath) {
+PhotosBmpReader*
+photos_bmp_reader_construct (GType object_type,
+                             const gchar* filepath)
+{
 	PhotosBmpReader* self = NULL;
-	const gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
-#line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	self = (PhotosBmpReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
+	self = (PhotosBmpReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP);
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1279 "BmpSupport.c"
+#line 1387 "BmpSupport.c"
 }
 
 
-PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath) {
+PhotosBmpReader*
+photos_bmp_reader_new (const gchar* filepath)
+{
 #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_reader_construct (PHOTOS_TYPE_BMP_READER, filepath);
-#line 1286 "BmpSupport.c"
+#line 1396 "BmpSupport.c"
 }
 
 
-static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) {
+static GdkPixbuf*
+photos_bmp_reader_real_scaled_read (PhotoFileReader* base,
+                                    Dimensions* full,
+                                    Dimensions* scaled,
+                                    GError** error)
+{
 	PhotosBmpReader * self;
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _result_ = NULL;
@@ -1311,7 +1426,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 	if (_tmp3_ > 9999) {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp1_ = TRUE;
-#line 1315 "BmpSupport.c"
+#line 1430 "BmpSupport.c"
 	} else {
 		Dimensions _tmp4_;
 		gint _tmp5_;
@@ -1321,11 +1436,11 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_tmp5_ = _tmp4_.height;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1325 "BmpSupport.c"
+#line 1440 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp1_) {
-#line 1329 "BmpSupport.c"
+#line 1444 "BmpSupport.c"
 		gboolean _tmp6_ = FALSE;
 		Dimensions _tmp7_;
 		gint _tmp8_;
@@ -1337,7 +1452,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		if (_tmp8_ < 100) {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp6_ = TRUE;
-#line 1341 "BmpSupport.c"
+#line 1456 "BmpSupport.c"
 		} else {
 			Dimensions _tmp9_;
 			gint _tmp10_;
@@ -1347,19 +1462,19 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_tmp10_ = _tmp9_.height;
 #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1351 "BmpSupport.c"
+#line 1466 "BmpSupport.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1355 "BmpSupport.c"
+#line 1470 "BmpSupport.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = FALSE;
-#line 1359 "BmpSupport.c"
+#line 1474 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp0_) {
-#line 1363 "BmpSupport.c"
+#line 1478 "BmpSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
@@ -1410,7 +1525,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_g_object_unref0 (_result_);
 #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			return NULL;
-#line 1414 "BmpSupport.c"
+#line 1529 "BmpSupport.c"
 		}
 #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1438,7 +1553,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_result_ = _tmp27_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1442 "BmpSupport.c"
+#line 1557 "BmpSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
 		gchar* _tmp29_;
@@ -1478,7 +1593,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_g_object_unref0 (_result_);
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			return NULL;
-#line 1482 "BmpSupport.c"
+#line 1597 "BmpSupport.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1490,30 +1605,36 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_result_ = _tmp37_;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (_tmp28_);
-#line 1494 "BmpSupport.c"
+#line 1609 "BmpSupport.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	result = _result_;
 #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1500 "BmpSupport.c"
+#line 1615 "BmpSupport.c"
 }
 
 
-static void photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) {
+static void
+photos_bmp_reader_class_init (PhotosBmpReaderClass * klass)
+{
 #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_reader_parent_class = g_type_class_peek_parent (klass);
 #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read;
-#line 1509 "BmpSupport.c"
+#line 1626 "BmpSupport.c"
 }
 
 
-static void photos_bmp_reader_instance_init (PhotosBmpReader * self) {
+static void
+photos_bmp_reader_instance_init (PhotosBmpReader * self)
+{
 }
 
 
-GType photos_bmp_reader_get_type (void) {
+GType
+photos_bmp_reader_get_type (void)
+{
 	static volatile gsize photos_bmp_reader_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_reader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpReader), 0, (GInstanceInitFunc) photos_bmp_reader_instance_init, NULL };
@@ -1525,73 +1646,83 @@ GType photos_bmp_reader_get_type (void) {
 }
 
 
-PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath) {
+PhotosBmpWriter*
+photos_bmp_writer_construct (GType object_type,
+                             const gchar* filepath)
+{
 	PhotosBmpWriter* self = NULL;
-	const gchar* _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
-#line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
+	self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP);
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1540 "BmpSupport.c"
+#line 1661 "BmpSupport.c"
 }
 
 
-PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath) {
+PhotosBmpWriter*
+photos_bmp_writer_new (const gchar* filepath)
+{
 #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_writer_construct (PHOTOS_TYPE_BMP_WRITER, filepath);
-#line 1547 "BmpSupport.c"
+#line 1670 "BmpSupport.c"
 }
 
 
-static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
+static void
+photos_bmp_writer_real_write (PhotoFileWriter* base,
+                              GdkPixbuf* pixbuf,
+                              JpegQuality quality,
+                              GError** error)
+{
 	PhotosBmpWriter * self;
-	GdkPixbuf* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_WRITER, PhotosBmpWriter);
 #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = pixbuf;
+	_tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp1_ = _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp2_ = _tmp1_;
-#line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	gdk_pixbuf_save (_tmp0_, _tmp2_, "bmp", &_inner_error_, NULL, NULL);
+	gdk_pixbuf_save (pixbuf, _tmp1_, "bmp", &_inner_error_, NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return;
-#line 1577 "BmpSupport.c"
+#line 1702 "BmpSupport.c"
 	}
 }
 
 
-static void photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) {
+static void
+photos_bmp_writer_class_init (PhotosBmpWriterClass * klass)
+{
 #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_writer_parent_class = g_type_class_peek_parent (klass);
 #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write;
-#line 1587 "BmpSupport.c"
+#line 1714 "BmpSupport.c"
 }
 
 
-static void photos_bmp_writer_instance_init (PhotosBmpWriter * self) {
+static void
+photos_bmp_writer_instance_init (PhotosBmpWriter * self)
+{
 }
 
 
-GType photos_bmp_writer_get_type (void) {
+GType
+photos_bmp_writer_get_type (void)
+{
 	static volatile gsize photos_bmp_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpWriter), 0, (GInstanceInitFunc) photos_bmp_writer_instance_init, NULL };
@@ -1603,52 +1734,64 @@ GType photos_bmp_writer_get_type (void) {
 }
 
 
-PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath) {
+PhotosBmpMetadataWriter*
+photos_bmp_metadata_writer_construct (GType object_type,
+                                      const gchar* filepath)
+{
 	PhotosBmpMetadataWriter* self = NULL;
-	const gchar* _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
-#line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
+	self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP);
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1618 "BmpSupport.c"
+#line 1749 "BmpSupport.c"
 }
 
 
-PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath) {
+PhotosBmpMetadataWriter*
+photos_bmp_metadata_writer_new (const gchar* filepath)
+{
 #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_metadata_writer_construct (PHOTOS_TYPE_BMP_METADATA_WRITER, filepath);
-#line 1625 "BmpSupport.c"
+#line 1758 "BmpSupport.c"
 }
 
 
-static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) {
+static void
+photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base,
+                                                PhotoMetadata* metadata,
+                                                GError** error)
+{
 	PhotosBmpMetadataWriter * self;
 #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_METADATA_WRITER, PhotosBmpMetadataWriter);
 #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1635 "BmpSupport.c"
+#line 1772 "BmpSupport.c"
 }
 
 
-static void photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass) {
+static void
+photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass)
+{
 #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata;
-#line 1644 "BmpSupport.c"
+#line 1783 "BmpSupport.c"
 }
 
 
-static void photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self) {
+static void
+photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self)
+{
 }
 
 
-GType photos_bmp_metadata_writer_get_type (void) {
+GType
+photos_bmp_metadata_writer_get_type (void)
+{
 	static volatile gsize photos_bmp_metadata_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_metadata_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpMetadataWriter), 0, (GInstanceInitFunc) photos_bmp_metadata_writer_instance_init, NULL };
@@ -1660,7 +1803,9 @@ GType photos_bmp_metadata_writer_get_type (void) {
 }
 
 
-void photos_bmp_file_format_driver_init (void) {
+void
+photos_bmp_file_format_driver_init (void)
+{
 	PhotosBmpFileFormatDriver* _tmp0_;
 #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0_ = photos_bmp_file_format_driver_new ();
@@ -1670,18 +1815,22 @@ void photos_bmp_file_format_driver_init (void) {
 	photos_bmp_file_format_driver_instance = _tmp0_;
 #line 147 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_properties_init ();
-#line 1674 "BmpSupport.c"
+#line 1819 "BmpSupport.c"
 }
 
 
-static gpointer _photo_file_format_driver_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_driver_ref0 (gpointer self)
+{
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1681 "BmpSupport.c"
+#line 1828 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
+PhotosBmpFileFormatDriver*
+photos_bmp_file_format_driver_get_instance (void)
+{
 	PhotosBmpFileFormatDriver* result = NULL;
 	PhotosBmpFileFormatDriver* _tmp0_;
 	PhotosBmpFileFormatDriver* _tmp1_;
@@ -1693,11 +1842,13 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1697 "BmpSupport.c"
+#line 1846 "BmpSupport.c"
 }
 
 
-static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
+static PhotoFileFormatProperties*
+photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
 	PhotosBmpFileFormatProperties* _tmp0_;
@@ -1709,32 +1860,34 @@ static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_propert
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1713 "BmpSupport.c"
+#line 1864 "BmpSupport.c"
 }
 
 
-static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileReader*
+photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                                  const gchar* filepath)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_;
-	PhotosBmpReader* _tmp1_;
+	PhotosBmpReader* _tmp0_;
 #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
-#line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = photos_bmp_reader_new (_tmp0_);
+	_tmp0_ = photos_bmp_reader_new (filepath);
 #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.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 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1734 "BmpSupport.c"
+#line 1885 "BmpSupport.c"
 }
 
 
-static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) {
+static gboolean
+photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base)
+{
 	PhotosBmpFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 162 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1743,11 +1896,13 @@ static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFor
 	result = TRUE;
 #line 163 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1747 "BmpSupport.c"
+#line 1900 "BmpSupport.c"
 }
 
 
-static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) {
+static gboolean
+photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base)
+{
 	PhotosBmpFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 166 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1756,77 +1911,77 @@ static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFile
 	result = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1760 "BmpSupport.c"
+#line 1915 "BmpSupport.c"
 }
 
 
-static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileWriter*
+photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                                  const gchar* filepath)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
-	const gchar* _tmp0_;
-	PhotosBmpWriter* _tmp1_;
+	PhotosBmpWriter* _tmp0_;
 #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
+	_tmp0_ = photos_bmp_writer_new (filepath);
 #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = photos_bmp_writer_new (_tmp0_);
-#line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.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 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1781 "BmpSupport.c"
+#line 1936 "BmpSupport.c"
 }
 
 
-static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileMetadataWriter*
+photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                           const gchar* filepath)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
-	const gchar* _tmp0_;
-	PhotosBmpMetadataWriter* _tmp1_;
+	PhotosBmpMetadataWriter* _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = filepath;
-#line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = photos_bmp_metadata_writer_new (_tmp0_);
+	_tmp0_ = photos_bmp_metadata_writer_new (filepath);
 #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.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 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1802 "BmpSupport.c"
+#line 1957 "BmpSupport.c"
 }
 
 
-static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
+static PhotoFileSniffer*
+photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                                   GFile* file,
+                                                   PhotoFileSnifferOptions options)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_;
-	PhotoFileSnifferOptions _tmp1_;
-	PhotosBmpSniffer* _tmp2_;
+	PhotosBmpSniffer* _tmp0_;
 #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp0_ = file;
-#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = options;
-#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp2_ = photos_bmp_sniffer_new (_tmp0_, _tmp1_);
+	_tmp0_ = photos_bmp_sniffer_new (file, options);
 #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.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 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1826 "BmpSupport.c"
+#line 1979 "BmpSupport.c"
 }
 
 
-static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
+static PhotoMetadata*
+photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base)
+{
 	PhotosBmpFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* _tmp0_;
@@ -1838,28 +1993,34 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF
 	result = _tmp0_;
 #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1842 "BmpSupport.c"
+#line 1997 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type) {
+PhotosBmpFileFormatDriver*
+photos_bmp_file_format_driver_construct (GType object_type)
+{
 	PhotosBmpFileFormatDriver* self = NULL;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = (PhotosBmpFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return self;
-#line 1852 "BmpSupport.c"
+#line 2009 "BmpSupport.c"
 }
 
 
-PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void) {
+PhotosBmpFileFormatDriver*
+photos_bmp_file_format_driver_new (void)
+{
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return photos_bmp_file_format_driver_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER);
-#line 1859 "BmpSupport.c"
+#line 2018 "BmpSupport.c"
 }
 
 
-static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass) {
+static void
+photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass)
+{
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	photos_bmp_file_format_driver_parent_class = g_type_class_peek_parent (klass);
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1880,25 +2041,31 @@ static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverC
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_create_metadata;
-#line 1884 "BmpSupport.c"
+#line 2045 "BmpSupport.c"
 }
 
 
-static void photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self) {
+static void
+photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self)
+{
 }
 
 
-static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
+static void
+photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj)
+{
 	PhotosBmpFileFormatDriver * self;
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
 #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_bmp_file_format_driver_parent_class)->finalize (obj);
-#line 1898 "BmpSupport.c"
+#line 2063 "BmpSupport.c"
 }
 
 
-GType photos_bmp_file_format_driver_get_type (void) {
+GType
+photos_bmp_file_format_driver_get_type (void)
+{
 	static volatile gsize photos_bmp_file_format_driver_type_id__volatile = 0;
 	if (g_once_init_enter (&photos_bmp_file_format_driver_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatDriver), 0, (GInstanceInitFunc) photos_bmp_file_format_driver_instance_init, NULL };