Merge branch 'release/0.28.3-1'0.28.3-1

author: Jörg Frings-Fürst <debian@jff.email> 2018-07-09 12:10:38 +0200
committer: Jörg Frings-Fürst <debian@jff.email> 2018-07-09 12:10:38 +0200
commit: 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree: 496b2f3899e1d5728ee9ae76095cc5056c317447 /src/photos/RawSupport.c
parent: f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent: 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)
1 files changed, 1098 insertions, 1028 deletions
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 8b670ea..bd5b4b7 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.36.6, the Vala compiler
+/* RawSupport.c generated by valac 0.40.4, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -480,31 +481,55 @@ static gpointer raw_reader_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;
@@ -513,15 +538,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 raw_file_format_driver_get_type (void) G_GNUC_CONST;
-enum  {
-	RAW_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
-};
 void raw_file_format_driver_init (void);
 RawFileFormatDriver* raw_file_format_driver_new (void);
 RawFileFormatDriver* raw_file_format_driver_construct (GType object_type);
@@ -530,133 +558,201 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void);
 static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base);
 GType raw_file_format_properties_get_type (void) G_GNUC_CONST;
 RawFileFormatProperties* raw_file_format_properties_get_instance (void);
-static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath);
+static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                                            const gchar* filepath);
 RawReader* raw_reader_new (const gchar* filepath);
-RawReader* raw_reader_construct (GType object_type, const gchar* filepath);
+RawReader* raw_reader_construct (GType object_type,
+                                 const gchar* filepath);
 GType raw_reader_get_type (void) G_GNUC_CONST;
 static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base);
 PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
 static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base);
 static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base);
-static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath);
-static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath);
-static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options);
-RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options);
-RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
+static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                                            const gchar* filepath);
+static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                                             const gchar* filepath);
+static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                                              GFile* file,
+                                                              PhotoFileSnifferOptions options);
+RawSniffer* raw_sniffer_new (GFile* file,
+                             PhotoFileSnifferOptions options);
+RawSniffer* raw_sniffer_construct (GType object_type,
+                                   GFile* file,
+                                   PhotoFileSnifferOptions options);
 GType raw_sniffer_get_type (void) G_GNUC_CONST;
 PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type);
 static void raw_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  {
-	RAW_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY
-};
 RawFileFormatProperties* raw_file_format_properties_new (void);
 RawFileFormatProperties* raw_file_format_properties_construct (GType object_type);
 static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base);
 static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base);
 static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
-static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup12 (gchar** self, int length);
+static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                              int* result_length1);
+static gchar** _vala_array_dup10 (gchar** self,
+                           int length);
 static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
-static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup13 (gchar** self, int length);
+static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                        int* result_length1);
+static gchar** _vala_array_dup11 (gchar** self,
+                           int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void raw_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  {
-	RAW_SNIFFER_DUMMY_PROPERTY
-};
-PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options);
-static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error);
+PhotoFileSniffer* photo_file_sniffer_construct (GType object_type,
+                                                GFile* file,
+                                                PhotoFileSnifferOptions options);
+static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
+                                                  gboolean* is_corrupted,
+                                                  GError** error);
 DetectedPhotoInformation* detected_photo_information_new (void);
 DetectedPhotoInformation* detected_photo_information_construct (GType object_type);
 gpointer graw_processor_ref (gpointer instance);
 void graw_processor_unref (gpointer instance);
-GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void graw_value_set_processor (GValue* value, gpointer v_object);
-void graw_value_take_processor (GValue* value, gpointer v_object);
+GParamSpec* graw_param_spec_processor (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void graw_value_set_processor (GValue* value,
+                               gpointer v_object);
+void graw_value_take_processor (GValue* value,
+                                gpointer v_object);
 gpointer graw_value_get_processor (const GValue* value);
 GType graw_processor_get_type (void) G_GNUC_CONST;
 GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options);
-GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options);
+GRawProcessor* graw_processor_construct (GType object_type,
+                                         enum LibRaw_constructor_flags options);
 libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self);
 GType graw_flip_get_type (void) G_GNUC_CONST;
 GQuark graw_exception_quark (void);
-void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error);
-void graw_processor_unpack (GRawProcessor* self, GError** error);
-void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error);
+void graw_processor_open_file (GRawProcessor* self,
+                               const gchar* filename,
+                               GError** error);
+void graw_processor_unpack (GRawProcessor* self,
+                            GError** error);
+void graw_processor_adjust_sizes_info_only (GRawProcessor* self,
+                                            GError** error);
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self);
-void dimensions_init (Dimensions *self, gint width, gint height);
-PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
-gchar* md5_file (GFile* file, GError** error);
-enum  {
-	RAW_READER_DUMMY_PROPERTY
-};
-PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
-static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error);
-void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
+void dimensions_init (Dimensions *self,
+                      gint width,
+                      gint height);
+PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self,
+                                                GError** error);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
+gchar* md5_file (GFile* file,
+                 GError** error);
+PhotoFileReader* photo_file_reader_construct (GType object_type,
+                                              const gchar* filepath,
+                                              PhotoFileFormat file_format);
+static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base,
+                                              GError** error);
+void media_metadata_read_from_file (MediaMetadata* self,
+                                    GFile* file,
+                                    GError** error);
 GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
-static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error);
-void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size);
+static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base,
+                                          GError** error);
+void graw_processor_configure_for_rgb_display (GRawProcessor* self,
+                                               gboolean half_size);
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self);
-void graw_processor_process (GRawProcessor* self, GError** error);
+void graw_processor_process (GRawProcessor* self,
+                             GError** error);
 gpointer graw_processed_image_ref (gpointer instance);
 void graw_processed_image_unref (gpointer instance);
-GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void graw_value_set_processed_image (GValue* value, gpointer v_object);
-void graw_value_take_processed_image (GValue* value, gpointer v_object);
+GParamSpec* graw_param_spec_processed_image (const gchar* name,
+                                             const gchar* nick,
+                                             const gchar* blurb,
+                                             GType object_type,
+                                             GParamFlags flags);
+void graw_value_set_processed_image (GValue* value,
+                                     gpointer v_object);
+void graw_value_take_processed_image (GValue* value,
+                                      gpointer v_object);
 gpointer graw_value_get_processed_image (const GValue* value);
 GType graw_processed_image_get_type (void) G_GNUC_CONST;
-GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error);
+GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self,
+                                                   GError** error);
 GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self);
-static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error);
+static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base,
+                                        Dimensions* full,
+                                        Dimensions* scaled,
+                                        GError** error);
 GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
 PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
-void graw_processor_unpack_thumb (GRawProcessor* self, GError** error);
-GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error);
-GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
+void graw_processor_unpack_thumb (GRawProcessor* self,
+                                  GError** error);
+GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self,
+                                                     GError** error);
+GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf,
+                          Dimensions* resized,
+                          GdkInterpType interp);
 GType raw_developer_get_type (void) G_GNUC_CONST;
 RawDeveloper* raw_developer_as_array (int* result_length1);
 gchar* raw_developer_to_string (RawDeveloper self);
 RawDeveloper raw_developer_from_string (const gchar* value);
 gchar* raw_developer_get_label (RawDeveloper self);
-gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d);
+gboolean raw_developer_is_equivalent (RawDeveloper self,
+                                      RawDeveloper d);
 gpointer backing_photo_row_ref (gpointer instance);
 void backing_photo_row_unref (gpointer instance);
-GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_backing_photo_row (GValue* value, gpointer v_object);
-void value_take_backing_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_photo_row (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_backing_photo_row (GValue* value,
+                                  gpointer v_object);
+void value_take_backing_photo_row (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_backing_photo_row (const GValue* value);
 GType backing_photo_row_get_type (void) G_GNUC_CONST;
-BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error);
+BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self,
+                                                                   const gchar* raw_filepath,
+                                                                   const gchar* camera_development_filename,
+                                                                   GError** error);
 BackingPhotoRow* backing_photo_row_new (void);
 BackingPhotoRow* backing_photo_row_construct (GType object_type);
-void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
+void disassemble_filename (const gchar* basename,
+                           gchar* * name,
+                           gchar* * ext);
 gchar* library_files_convert_basename (const gchar* basename);
-GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
-gboolean claim_file (GFile* file, GError** error);
+GFile* generate_unique_file (GFile* dir,
+                             const gchar* basename,
+                             gboolean* collision,
+                             GError** error);
+gboolean claim_file (GFile* file,
+                     GError** error);
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
 void backing_photo_id_free (BackingPhotoID* self);
 GType orientation_get_type (void) G_GNUC_CONST;
 
 
-void raw_file_format_driver_init (void) {
+void
+raw_file_format_driver_init (void)
+{
 	RawFileFormatDriver* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_driver_new ();
@@ -666,18 +762,22 @@ void raw_file_format_driver_init (void) {
 	raw_file_format_driver_instance = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_init ();
-#line 670 "RawSupport.c"
+#line 766 "RawSupport.c"
 }
 
 
-static gpointer _photo_file_format_driver_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_driver_ref0 (gpointer self)
+{
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 677 "RawSupport.c"
+#line 775 "RawSupport.c"
 }
 
 
-RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
+RawFileFormatDriver*
+raw_file_format_driver_get_instance (void)
+{
 	RawFileFormatDriver* result = NULL;
 	RawFileFormatDriver* _tmp0_;
 	RawFileFormatDriver* _tmp1_;
@@ -689,11 +789,13 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 693 "RawSupport.c"
+#line 793 "RawSupport.c"
 }
 
 
-static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) {
+static PhotoFileFormatProperties*
+raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base)
+{
 	RawFileFormatDriver * self;
 	PhotoFileFormatProperties* result = NULL;
 	RawFileFormatProperties* _tmp0_;
@@ -705,32 +807,34 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 709 "RawSupport.c"
+#line 811 "RawSupport.c"
 }
 
 
-static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileReader*
+raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base,
+                                           const gchar* filepath)
+{
 	RawFileFormatDriver * self;
 	PhotoFileReader* result = NULL;
-	const gchar* _tmp0_;
-	RawReader* _tmp1_;
+	RawReader* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = filepath;
-#line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = raw_reader_new (_tmp0_);
+	_tmp0_ = raw_reader_new (filepath);
 #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.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 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 730 "RawSupport.c"
+#line 832 "RawSupport.c"
 }
 
 
-static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) {
+static PhotoMetadata*
+raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base)
+{
 	RawFileFormatDriver * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* _tmp0_;
@@ -742,11 +846,13 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 746 "RawSupport.c"
+#line 850 "RawSupport.c"
 }
 
 
-static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) {
+static gboolean
+raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base)
+{
 	RawFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -755,11 +861,13 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = FALSE;
 #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 759 "RawSupport.c"
+#line 865 "RawSupport.c"
 }
 
 
-static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) {
+static gboolean
+raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base)
+{
 	RawFileFormatDriver * self;
 	gboolean result = FALSE;
 #line 35 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -768,11 +876,14 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = FALSE;
 #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 772 "RawSupport.c"
+#line 880 "RawSupport.c"
 }
 
 
-static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileWriter*
+raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base,
+                                           const gchar* filepath)
+{
 	RawFileFormatDriver * self;
 	PhotoFileWriter* result = NULL;
 #line 39 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -783,11 +894,14 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm
 	result = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 787 "RawSupport.c"
+#line 898 "RawSupport.c"
 }
 
 
-static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) {
+static PhotoFileMetadataWriter*
+raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base,
+                                                    const gchar* filepath)
+{
 	RawFileFormatDriver * self;
 	PhotoFileMetadataWriter* result = NULL;
 #line 43 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -798,52 +912,56 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ
 	result = NULL;
 #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 802 "RawSupport.c"
+#line 916 "RawSupport.c"
 }
 
 
-static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) {
+static PhotoFileSniffer*
+raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base,
+                                            GFile* file,
+                                            PhotoFileSnifferOptions options)
+{
 	RawFileFormatDriver * self;
 	PhotoFileSniffer* result = NULL;
-	GFile* _tmp0_;
-	PhotoFileSnifferOptions _tmp1_;
-	RawSniffer* _tmp2_;
+	RawSniffer* _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = file;
+	_tmp0_ = raw_sniffer_new (file, options);
 #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = options;
-#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp2_ = raw_sniffer_new (_tmp0_, _tmp1_);
-#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.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 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 826 "RawSupport.c"
+#line 938 "RawSupport.c"
 }
 
 
-RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) {
+RawFileFormatDriver*
+raw_file_format_driver_construct (GType object_type)
+{
 	RawFileFormatDriver* self = NULL;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 836 "RawSupport.c"
+#line 950 "RawSupport.c"
 }
 
 
-RawFileFormatDriver* raw_file_format_driver_new (void) {
+RawFileFormatDriver*
+raw_file_format_driver_new (void)
+{
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER);
-#line 843 "RawSupport.c"
+#line 959 "RawSupport.c"
 }
 
 
-static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) {
+static void
+raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_driver_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -864,25 +982,31 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
-#line 868 "RawSupport.c"
+#line 986 "RawSupport.c"
 }
 
 
-static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) {
+static void
+raw_file_format_driver_instance_init (RawFileFormatDriver * self)
+{
 }
 
 
-static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
+static void
+raw_file_format_driver_finalize (PhotoFileFormatDriver * obj)
+{
 	RawFileFormatDriver * self;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj);
-#line 882 "RawSupport.c"
+#line 1004 "RawSupport.c"
 }
 
 
-GType raw_file_format_driver_get_type (void) {
+GType
+raw_file_format_driver_get_type (void)
+{
 	static volatile gsize raw_file_format_driver_type_id__volatile = 0;
 	if (g_once_init_enter (&raw_file_format_driver_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatDriver), 0, (GInstanceInitFunc) raw_file_format_driver_instance_init, NULL };
@@ -894,7 +1018,9 @@ GType raw_file_format_driver_get_type (void) {
 }
 
 
-void raw_file_format_properties_init (void) {
+void
+raw_file_format_properties_init (void)
+{
 	RawFileFormatProperties* _tmp0_;
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = raw_file_format_properties_new ();
@@ -902,18 +1028,22 @@ void raw_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (raw_file_format_properties_instance);
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_instance = _tmp0_;
-#line 906 "RawSupport.c"
+#line 1032 "RawSupport.c"
 }
 
 
-static gpointer _photo_file_format_properties_ref0 (gpointer self) {
+static gpointer
+_photo_file_format_properties_ref0 (gpointer self)
+{
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 913 "RawSupport.c"
+#line 1041 "RawSupport.c"
 }
 
 
-RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
+RawFileFormatProperties*
+raw_file_format_properties_get_instance (void)
+{
 	RawFileFormatProperties* result = NULL;
 	RawFileFormatProperties* _tmp0_;
 	RawFileFormatProperties* _tmp1_;
@@ -925,11 +1055,13 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
 	result = _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 929 "RawSupport.c"
+#line 1059 "RawSupport.c"
 }
 
 
-static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) {
+static PhotoFileFormat
+raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base)
+{
 	RawFileFormatProperties * self;
 	PhotoFileFormat result = 0;
 #line 129 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -938,11 +1070,13 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil
 	result = PHOTO_FILE_FORMAT_RAW;
 #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 942 "RawSupport.c"
+#line 1074 "RawSupport.c"
 }
 
 
-static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) {
+static gchar*
+raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base)
+{
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -954,11 +1088,13 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
 	result = _tmp0_;
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 958 "RawSupport.c"
+#line 1092 "RawSupport.c"
 }
 
 
-static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) {
+static PhotoFileFormatFlags
+raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base)
+{
 	RawFileFormatProperties * self;
 	PhotoFileFormatFlags result = 0;
 #line 137 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -967,11 +1103,13 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 971 "RawSupport.c"
+#line 1107 "RawSupport.c"
 }
 
 
-static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) {
+static gchar*
+raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base)
+{
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -983,32 +1121,38 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo
 	result = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 987 "RawSupport.c"
+#line 1125 "RawSupport.c"
 }
 
 
-static gchar** _vala_array_dup12 (gchar** self, int length) {
+static gchar**
+_vala_array_dup10 (gchar** self,
+                   int length)
+{
 	gchar** result;
 	int i;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 998 "RawSupport.c"
+#line 1139 "RawSupport.c"
 		gchar* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1004 "RawSupport.c"
+#line 1145 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1008 "RawSupport.c"
+#line 1149 "RawSupport.c"
 }
 
 
-static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base,
+                                                      int* result_length1)
+{
 	RawFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -1024,7 +1168,7 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0__length1 = raw_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup12 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1035,17 +1179,19 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 	if (result_length1) {
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1039 "RawSupport.c"
+#line 1183 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1045 "RawSupport.c"
+#line 1189 "RawSupport.c"
 }
 
 
-static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) {
+static gchar*
+raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base)
+{
 	RawFileFormatProperties * self;
 	gchar* result = NULL;
 	gchar** _tmp0_;
@@ -1066,32 +1212,38 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
 	result = _tmp2_;
 #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1070 "RawSupport.c"
+#line 1216 "RawSupport.c"
 }
 
 
-static gchar** _vala_array_dup13 (gchar** self, int length) {
+static gchar**
+_vala_array_dup11 (gchar** self,
+                   int length)
+{
 	gchar** result;
 	int i;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1081 "RawSupport.c"
+#line 1230 "RawSupport.c"
 		gchar* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1087 "RawSupport.c"
+#line 1236 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1091 "RawSupport.c"
+#line 1240 "RawSupport.c"
 }
 
 
-static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) {
+static gchar**
+raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base,
+                                                int* result_length1)
+{
 	RawFileFormatProperties * self;
 	gchar** result = NULL;
 	gchar** _tmp0_;
@@ -1107,7 +1259,7 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0__length1 = raw_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1118,34 +1270,40 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 	if (result_length1) {
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1122 "RawSupport.c"
+#line 1274 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1128 "RawSupport.c"
+#line 1280 "RawSupport.c"
 }
 
 
-RawFileFormatProperties* raw_file_format_properties_construct (GType object_type) {
+RawFileFormatProperties*
+raw_file_format_properties_construct (GType object_type)
+{
 	RawFileFormatProperties* self = NULL;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1138 "RawSupport.c"
+#line 1292 "RawSupport.c"
 }
 
 
-RawFileFormatProperties* raw_file_format_properties_new (void) {
+RawFileFormatProperties*
+raw_file_format_properties_new (void)
+{
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES);
-#line 1145 "RawSupport.c"
+#line 1301 "RawSupport.c"
 }
 
 
-static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) {
+static void
+raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
@@ -1613,25 +1771,31 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 	raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_;
 #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51;
-#line 1617 "RawSupport.c"
+#line 1775 "RawSupport.c"
 }
 
 
-static void raw_file_format_properties_instance_init (RawFileFormatProperties * self) {
+static void
+raw_file_format_properties_instance_init (RawFileFormatProperties * self)
+{
 }
 
 
-static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) {
+static void
+raw_file_format_properties_finalize (PhotoFileFormatProperties * obj)
+{
 	RawFileFormatProperties * self;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj);
-#line 1631 "RawSupport.c"
+#line 1793 "RawSupport.c"
 }
 
 
-GType raw_file_format_properties_get_type (void) {
+GType
+raw_file_format_properties_get_type (void)
+{
 	static volatile gsize raw_file_format_properties_type_id__volatile = 0;
 	if (g_once_init_enter (&raw_file_format_properties_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatProperties), 0, (GInstanceInitFunc) raw_file_format_properties_instance_init, NULL };
@@ -1643,39 +1807,46 @@ GType raw_file_format_properties_get_type (void) {
 }
 
 
-RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) {
+RawSniffer*
+raw_sniffer_construct (GType object_type,
+                       GFile* file,
+                       PhotoFileSnifferOptions options)
+{
 	RawSniffer* self = NULL;
-	GFile* _tmp0_;
-	PhotoFileSnifferOptions _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = file;
-#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = options;
-#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
+	self = (RawSniffer*) photo_file_sniffer_construct (object_type, file, options);
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1661 "RawSupport.c"
+#line 1823 "RawSupport.c"
 }
 
 
-RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
+RawSniffer*
+raw_sniffer_new (GFile* file,
+                 PhotoFileSnifferOptions options)
+{
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options);
-#line 1668 "RawSupport.c"
+#line 1833 "RawSupport.c"
 }
 
 
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1675 "RawSupport.c"
+#line 1842 "RawSupport.c"
 }
 
 
-static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) {
+static DetectedPhotoInformation*
+raw_sniffer_real_sniff (PhotoFileSniffer* base,
+                        gboolean* is_corrupted,
+                        GError** error)
+{
 	RawSniffer * self;
 	gboolean _vala_is_corrupted = FALSE;
 	DetectedPhotoInformation* result = NULL;
@@ -1688,26 +1859,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	libraw_output_params_t* _tmp4_;
 	DetectedPhotoInformation* _tmp14_;
 	GRawProcessor* _tmp15_;
-	libraw_image_sizes_t _tmp16_;
-	gushort _tmp17_;
-	GRawProcessor* _tmp18_;
-	libraw_image_sizes_t _tmp19_;
-	gushort _tmp20_;
+	gushort _tmp16_;
+	GRawProcessor* _tmp17_;
+	gushort _tmp18_;
+	DetectedPhotoInformation* _tmp19_;
+	DetectedPhotoInformation* _tmp20_;
 	DetectedPhotoInformation* _tmp21_;
-	DetectedPhotoInformation* _tmp22_;
-	DetectedPhotoInformation* _tmp23_;
 	RawReader* reader = NULL;
-	GFile* _tmp24_;
-	gchar* _tmp25_;
-	gchar* _tmp26_;
-	RawReader* _tmp27_;
-	RawReader* _tmp28_;
-	DetectedPhotoInformation* _tmp34_;
-	PhotoMetadata* _tmp35_;
-	gboolean _tmp58_;
-	DetectedPhotoInformation* _tmp64_;
-	gchar* _tmp65_;
-	DetectedPhotoInformation* _tmp66_;
+	GFile* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	RawReader* _tmp25_;
+	RawReader* _tmp26_;
+	DetectedPhotoInformation* _tmp32_;
+	PhotoMetadata* _tmp33_;
+	gboolean _tmp42_;
+	DetectedPhotoInformation* _tmp48_;
+	gchar* _tmp49_;
+	DetectedPhotoInformation* _tmp50_;
 	GError * _inner_error_ = NULL;
 #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer);
@@ -1729,7 +1898,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp4_ = _tmp3_;
 #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 1733 "RawSupport.c"
+#line 1902 "RawSupport.c"
 	{
 		GRawProcessor* _tmp5_;
 		GFile* _tmp6_;
@@ -1753,8 +1922,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1757 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1926 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1766,7 +1935,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1770 "RawSupport.c"
+#line 1939 "RawSupport.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp9_ = processor;
@@ -1776,8 +1945,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1780 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1949 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1789,7 +1958,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1793 "RawSupport.c"
+#line 1962 "RawSupport.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = processor;
@@ -1799,8 +1968,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1803 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1972 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1812,11 +1981,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1816 "RawSupport.c"
+#line 1985 "RawSupport.c"
 		}
 	}
-	goto __finally32;
-	__catch32_graw_exception:
+	goto __finally36;
+	__catch36_graw_exception:
 	{
 		GError* exception = NULL;
 		GError* _tmp11_;
@@ -1842,11 +2011,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			if (is_corrupted) {
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				*is_corrupted = _vala_is_corrupted;
-#line 1846 "RawSupport.c"
+#line 2015 "RawSupport.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 1850 "RawSupport.c"
+#line 2019 "RawSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp12_ = exception;
@@ -1856,10 +2025,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = _tmp13_;
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
-#line 1860 "RawSupport.c"
-		goto __finally32;
+#line 2029 "RawSupport.c"
+		goto __finally36;
 	}
-	__finally32:
+	__finally36:
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1870,84 +2039,80 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1874 "RawSupport.c"
+#line 2043 "RawSupport.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = detected;
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp15_ = processor;
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp16_ = graw_processor_get_sizes (_tmp15_);
-#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp17_ = _tmp16_.iwidth;
+	_tmp16_ = graw_processor_get_sizes (_tmp15_).iwidth;
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp18_ = processor;
-#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp19_ = graw_processor_get_sizes (_tmp18_);
+	_tmp17_ = processor;
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp20_ = _tmp19_.iheight;
+	_tmp18_ = graw_processor_get_sizes (_tmp17_).iheight;
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	dimensions_init (&_tmp14_->image_dim, (gint) _tmp17_, (gint) _tmp20_);
+	dimensions_init (&_tmp14_->image_dim, (gint) _tmp16_, (gint) _tmp18_);
 #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp21_ = detected;
+	_tmp19_ = detected;
 #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp21_->colorspace = GDK_COLORSPACE_RGB;
+	_tmp19_->colorspace = GDK_COLORSPACE_RGB;
 #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp22_ = detected;
+	_tmp20_ = detected;
 #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp22_->channels = 3;
+	_tmp20_->channels = 3;
 #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp23_ = detected;
+	_tmp21_ = detected;
 #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp23_->bits_per_channel = 8;
+	_tmp21_->bits_per_channel = 8;
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
+	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp25_ = g_file_get_path (_tmp24_);
+	_tmp23_ = g_file_get_path (_tmp22_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp26_ = _tmp25_;
+	_tmp24_ = _tmp23_;
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp27_ = raw_reader_new (_tmp26_);
+	_tmp25_ = raw_reader_new (_tmp24_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp28_ = _tmp27_;
+	_tmp26_ = _tmp25_;
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp26_);
+	_g_free0 (_tmp24_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	reader = _tmp28_;
-#line 1918 "RawSupport.c"
+	reader = _tmp26_;
+#line 2083 "RawSupport.c"
 	{
-		PhotoMetadata* _tmp29_ = NULL;
-		RawReader* _tmp30_;
+		PhotoMetadata* _tmp27_ = NULL;
+		RawReader* _tmp28_;
+		PhotoMetadata* _tmp29_;
+		DetectedPhotoInformation* _tmp30_;
 		PhotoMetadata* _tmp31_;
-		DetectedPhotoInformation* _tmp32_;
-		PhotoMetadata* _tmp33_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp30_ = reader;
+		_tmp28_ = reader;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp31_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_);
+		_tmp29_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_);
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp29_ = _tmp31_;
+		_tmp27_ = _tmp29_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1933 "RawSupport.c"
-			goto __catch33_g_error;
+#line 2098 "RawSupport.c"
+			goto __catch37_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp32_ = detected;
+		_tmp30_ = detected;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp33_ = _tmp29_;
+		_tmp31_ = _tmp27_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp29_ = NULL;
+		_tmp27_ = NULL;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_media_metadata_unref0 (_tmp32_->metadata);
+		_media_metadata_unref0 (_tmp30_->metadata);
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp32_->metadata = _tmp33_;
+		_tmp30_->metadata = _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_media_metadata_unref0 (_tmp29_);
-#line 1948 "RawSupport.c"
+		_media_metadata_unref0 (_tmp27_);
+#line 2113 "RawSupport.c"
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally37;
+	__catch37_g_error:
 	{
 		GError* err = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1956,9 +2121,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (err);
-#line 1960 "RawSupport.c"
+#line 2125 "RawSupport.c"
 	}
-	__finally33:
+	__finally37:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1971,249 +2136,143 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1975 "RawSupport.c"
+#line 2140 "RawSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp34_ = detected;
+	_tmp32_ = detected;
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp35_ = _tmp34_->metadata;
+	_tmp33_ = _tmp32_->metadata;
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp35_ != NULL) {
-#line 1983 "RawSupport.c"
-		guint8* flattened_sans_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp36_;
-		PhotoMetadata* _tmp37_;
-		gint _tmp38_;
-		guint8* _tmp39_;
-		gint flattened_sans_thumbnail_length1;
-		gint _flattened_sans_thumbnail_size_;
-		gboolean _tmp40_ = FALSE;
-		guint8* _tmp41_;
-		gint _tmp41__length1;
-		guint8* flattened_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp47_;
-		PhotoMetadata* _tmp48_;
-		gint _tmp49_;
-		guint8* _tmp50_;
-		gint flattened_thumbnail_length1;
-		gint _flattened_thumbnail_size_;
-		gboolean _tmp51_ = FALSE;
-		guint8* _tmp52_;
-		gint _tmp52__length1;
+	if (_tmp33_ != NULL) {
+#line 2148 "RawSupport.c"
+		DetectedPhotoInformation* _tmp34_;
+		DetectedPhotoInformation* _tmp35_;
+		PhotoMetadata* _tmp36_;
+		gchar* _tmp37_;
+		DetectedPhotoInformation* _tmp38_;
+		DetectedPhotoInformation* _tmp39_;
+		PhotoMetadata* _tmp40_;
+		gchar* _tmp41_;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp36_ = detected;
+		_tmp34_ = detected;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp37_ = _tmp36_->metadata;
+		_tmp35_ = detected;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp39_ = photo_metadata_flatten_exif (_tmp37_, FALSE, &_tmp38_);
+		_tmp36_ = _tmp35_->metadata;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail = _tmp39_;
+		_tmp37_ = photo_metadata_exif_hash (_tmp36_);
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail_length1 = _tmp38_;
+		_g_free0 (_tmp34_->exif_md5);
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp41_ = flattened_sans_thumbnail;
-#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp41__length1 = flattened_sans_thumbnail_length1;
+		_tmp34_->exif_md5 = _tmp37_;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp41_ != NULL) {
-#line 2022 "RawSupport.c"
-			guint8* _tmp42_;
-			gint _tmp42__length1;
+		_tmp38_ = detected;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp42_ = flattened_sans_thumbnail;
+		_tmp39_ = detected;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp42__length1 = flattened_sans_thumbnail_length1;
+		_tmp40_ = _tmp39_->metadata;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp40_ = _tmp42__length1 > 0;
-#line 2031 "RawSupport.c"
-		} else {
+		_tmp41_ = photo_metadata_thumbnail_hash (_tmp40_);
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp40_ = FALSE;
-#line 2035 "RawSupport.c"
-		}
+		_g_free0 (_tmp38_->thumbnail_md5);
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp40_) {
-#line 2039 "RawSupport.c"
-			DetectedPhotoInformation* _tmp43_;
-			guint8* _tmp44_;
-			gint _tmp44__length1;
-			guint8* _tmp45_;
-			gint _tmp45__length1;
-			gchar* _tmp46_;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp43_ = detected;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp44_ = flattened_sans_thumbnail;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp44__length1 = flattened_sans_thumbnail_length1;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp45_ = flattened_sans_thumbnail;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp45__length1 = flattened_sans_thumbnail_length1;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp46_ = md5_binary (_tmp44_, (gsize) _tmp45__length1);
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp43_->exif_md5);
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp43_->exif_md5 = _tmp46_;
-#line 2062 "RawSupport.c"
-		}
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp47_ = detected;
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp48_ = _tmp47_->metadata;
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp50_ = photo_metadata_flatten_exif_preview (_tmp48_, &_tmp49_);
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail = _tmp50_;
+		_tmp38_->thumbnail_md5 = _tmp41_;
+#line 2181 "RawSupport.c"
+	}
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail_length1 = _tmp49_;
+	_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_flattened_thumbnail_size_ = flattened_thumbnail_length1;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp52_ = flattened_thumbnail;
+	if (_tmp42_) {
+#line 2187 "RawSupport.c"
+		gchar* _tmp43_ = NULL;
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		DetectedPhotoInformation* _tmp46_;
+		gchar* _tmp47_;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp52__length1 = flattened_thumbnail_length1;
+		_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp52_ != NULL) {
-#line 2082 "RawSupport.c"
-			guint8* _tmp53_;
-			gint _tmp53__length1;
+		_tmp45_ = md5_file (_tmp44_, &_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp53_ = flattened_thumbnail;
+		_tmp43_ = _tmp45_;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp53__length1 = flattened_thumbnail_length1;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp51_ = _tmp53__length1 > 0;
-#line 2091 "RawSupport.c"
-		} else {
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp51_ = FALSE;
-#line 2095 "RawSupport.c"
-		}
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp51_) {
-#line 2099 "RawSupport.c"
-			DetectedPhotoInformation* _tmp54_;
-			guint8* _tmp55_;
-			gint _tmp55__length1;
-			guint8* _tmp56_;
-			gint _tmp56__length1;
-			gchar* _tmp57_;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp54_ = detected;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp55_ = flattened_thumbnail;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp55__length1 = flattened_thumbnail_length1;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp56_ = flattened_thumbnail;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp56__length1 = flattened_thumbnail_length1;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp54_->thumbnail_md5);
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2122 "RawSupport.c"
-		}
-#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
-#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 2128 "RawSupport.c"
-	}
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp58_) {
-#line 2134 "RawSupport.c"
-		gchar* _tmp59_ = NULL;
-		GFile* _tmp60_;
-		gchar* _tmp61_;
-		DetectedPhotoInformation* _tmp62_;
-		gchar* _tmp63_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp61_ = md5_file (_tmp60_, &_inner_error_);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp59_ = _tmp61_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_detected_photo_information_unref0 (detected);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 2158 "RawSupport.c"
+#line 2211 "RawSupport.c"
 		}
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp62_ = detected;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp63_ = _tmp59_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp59_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp62_->md5);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp62_->md5 = _tmp63_;
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp59_);
-#line 2172 "RawSupport.c"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp46_ = detected;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp47_ = _tmp43_;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp43_ = NULL;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp46_->md5);
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp46_->md5 = _tmp47_;
+#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp43_);
+#line 2225 "RawSupport.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp64_ = detected;
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp65_ = g_strdup ("raw");
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp64_->format_name);
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp64_->format_name = _tmp65_;
-#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp66_ = detected;
-#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp66_->file_format = PHOTO_FILE_FORMAT_RAW;
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp48_ = detected;
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp49_ = g_strdup ("raw");
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (_tmp48_->format_name);
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp48_->format_name = _tmp49_;
+#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp50_ = detected;
+#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp50_->file_format = PHOTO_FILE_FORMAT_RAW;
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = detected;
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (is_corrupted) {
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 2196 "RawSupport.c"
+#line 2249 "RawSupport.c"
 	}
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2200 "RawSupport.c"
+#line 2253 "RawSupport.c"
 }
 
 
-static void raw_sniffer_class_init (RawSnifferClass * klass) {
+static void
+raw_sniffer_class_init (RawSnifferClass * klass)
+{
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff;
-#line 2209 "RawSupport.c"
+#line 2264 "RawSupport.c"
 }
 
 
-static void raw_sniffer_instance_init (RawSniffer * self) {
+static void
+raw_sniffer_instance_init (RawSniffer * self)
+{
 }
 
 
-GType raw_sniffer_get_type (void) {
+GType
+raw_sniffer_get_type (void)
+{
 	static volatile gsize raw_sniffer_type_id__volatile = 0;
 	if (g_once_init_enter (&raw_sniffer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RawSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawSniffer), 0, (GInstanceInitFunc) raw_sniffer_instance_init, NULL };
@@ -2225,29 +2284,34 @@ GType raw_sniffer_get_type (void) {
 }
 
 
-RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
+RawReader*
+raw_reader_construct (GType object_type,
+                      const gchar* filepath)
+{
 	RawReader* self = NULL;
-	const gchar* _tmp0_;
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = filepath;
-#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	self = (RawReader*) photo_file_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_RAW);
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 2240 "RawSupport.c"
+#line 2299 "RawSupport.c"
 }
 
 
-RawReader* raw_reader_new (const gchar* filepath) {
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+RawReader*
+raw_reader_new (const gchar* filepath)
+{
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2247 "RawSupport.c"
+#line 2308 "RawSupport.c"
 }
 
 
-static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error) {
+static PhotoMetadata*
+raw_reader_real_read_metadata (PhotoFileReader* base,
+                               GError** error)
+{
 	RawReader * self;
 	PhotoMetadata* result = NULL;
 	PhotoMetadata* metadata = NULL;
@@ -2255,39 +2319,42 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 	GFile* _tmp1_;
 	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = photo_metadata_new ();
-#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	metadata = _tmp0_;
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp2_, &_inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2281 "RawSupport.c"
+#line 2345 "RawSupport.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = metadata;
-#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2287 "RawSupport.c"
+#line 2351 "RawSupport.c"
 }
 
 
-static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error) {
+static GdkPixbuf*
+raw_reader_real_unscaled_read (PhotoFileReader* base,
+                               GError** error)
+{
 	RawReader * self;
 	GdkPixbuf* result = NULL;
 	GRawProcessor* processor = NULL;
@@ -2306,103 +2373,108 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	GRawProcessedImage* _tmp12_;
 	GdkPixbuf* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	processor = _tmp0_;
-#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = processor;
-#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_configure_for_rgb_display (_tmp1_, FALSE);
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = processor;
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = graw_processor_get_output_params (_tmp2_);
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = processor;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_open_file (_tmp5_, _tmp7_, &_inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp7_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2346 "RawSupport.c"
+#line 2413 "RawSupport.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = processor;
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_unpack (_tmp8_, &_inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2360 "RawSupport.c"
+#line 2427 "RawSupport.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = processor;
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_process (_tmp9_, &_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2374 "RawSupport.c"
+#line 2441 "RawSupport.c"
 	}
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = processor;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = graw_processor_make_mem_image (_tmp11_, &_inner_error_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp10_ = _tmp12_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2390 "RawSupport.c"
+#line 2457 "RawSupport.c"
 	}
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp13_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (_tmp10_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2402 "RawSupport.c"
+#line 2469 "RawSupport.c"
 }
 
 
-static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) {
+static GdkPixbuf*
+raw_reader_real_scaled_read (PhotoFileReader* base,
+                             Dimensions* full,
+                             Dimensions* scaled,
+                             GError** error)
+{
 	RawReader * self;
 	GdkPixbuf* result = NULL;
 	gdouble width_proportion = 0.0;
@@ -2428,273 +2500,276 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GRawProcessor* _tmp17_;
 	gchar* _tmp18_;
 	gchar* _tmp19_;
+	GRawProcessor* _tmp29_;
 	GRawProcessor* _tmp30_;
-	GRawProcessor* _tmp31_;
 	GRawProcessedImage* image = NULL;
-	GRawProcessor* _tmp32_;
+	GRawProcessor* _tmp31_;
+	GRawProcessedImage* _tmp32_;
 	GRawProcessedImage* _tmp33_;
-	GRawProcessedImage* _tmp34_;
+	GdkPixbuf* _tmp34_;
 	GdkPixbuf* _tmp35_;
-	GdkPixbuf* _tmp36_;
-	Dimensions _tmp37_;
+	Dimensions _tmp36_;
+	GdkPixbuf* _tmp37_;
 	GdkPixbuf* _tmp38_;
-	GdkPixbuf* _tmp39_;
 	GError * _inner_error_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (full != NULL, NULL);
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = *scaled;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_.width;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = *full;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = _tmp2_.width;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = *scaled;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_.height;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = *full;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_.height;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = width_proportion;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp9_ < 0.5) {
-#line 2474 "RawSupport.c"
+#line 2546 "RawSupport.c"
 		gdouble _tmp10_;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = height_proportion;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = _tmp10_ < 0.5;
-#line 2480 "RawSupport.c"
+#line 2552 "RawSupport.c"
 	} else {
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = FALSE;
-#line 2484 "RawSupport.c"
+#line 2556 "RawSupport.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	half_size = _tmp8_;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	processor = _tmp11_;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = processor;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = half_size;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = processor;
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp15_ = graw_processor_get_output_params (_tmp14_);
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp16_ = _tmp15_;
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp17_ = processor;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp18_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp19_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2524 "RawSupport.c"
+#line 2596 "RawSupport.c"
 	}
 	{
-		PhotoFileReaderRole _tmp20_;
-#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader));
-#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
-#line 2532 "RawSupport.c"
-			GRawProcessor* _tmp21_;
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		if (photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)) == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
+#line 2601 "RawSupport.c"
+			GRawProcessor* _tmp20_;
 			GRawProcessedImage* image = NULL;
-			GRawProcessor* _tmp22_;
+			GRawProcessor* _tmp21_;
+			GRawProcessedImage* _tmp22_;
 			GRawProcessedImage* _tmp23_;
-			GRawProcessedImage* _tmp24_;
+			GdkPixbuf* _tmp24_;
 			GdkPixbuf* _tmp25_;
-			GdkPixbuf* _tmp26_;
-			Dimensions _tmp27_;
+			Dimensions _tmp26_;
+			GdkPixbuf* _tmp27_;
 			GdkPixbuf* _tmp28_;
-			GdkPixbuf* _tmp29_;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp21_ = processor;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			graw_processor_unpack_thumb (_tmp21_, &_inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp20_ = processor;
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			graw_processor_unpack_thumb (_tmp20_, &_inner_error_);
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2549 "RawSupport.c"
-				goto __catch34_g_error;
+#line 2618 "RawSupport.c"
+				goto __catch38_g_error;
 			}
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp22_ = processor;
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			image = _tmp23_;
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp21_ = processor;
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp22_ = graw_processor_make_thumb_image (_tmp21_, &_inner_error_);
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			image = _tmp22_;
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2560 "RawSupport.c"
-				goto __catch34_g_error;
+#line 2629 "RawSupport.c"
+				goto __catch38_g_error;
 			}
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp24_ = image;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp26_ = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp27_ = *scaled;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp29_ = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_object_unref0 (_tmp26_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			result = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp23_ = image;
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp24_ = graw_processed_image_get_pixbuf_copy (_tmp23_);
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp25_ = _tmp24_;
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp26_ = *scaled;
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp27_ = resize_pixbuf (_tmp25_, &_tmp26_, GDK_INTERP_BILINEAR);
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp28_ = _tmp27_;
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_g_object_unref0 (_tmp25_);
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			result = _tmp28_;
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processed_image_unref0 (image);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2585 "RawSupport.c"
+#line 2654 "RawSupport.c"
 		}
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally38;
+	__catch38_g_error:
 	{
 		GError* _error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_error_ = _inner_error_;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_inner_error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (_error_);
-#line 2598 "RawSupport.c"
+#line 2667 "RawSupport.c"
 	}
-	__finally34:
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	__finally38:
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2609 "RawSupport.c"
+#line 2678 "RawSupport.c"
 	}
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp30_ = processor;
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_unpack (_tmp30_, &_inner_error_);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp29_ = processor;
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_unpack (_tmp29_, &_inner_error_);
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2623 "RawSupport.c"
+#line 2692 "RawSupport.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp31_ = processor;
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_process (_tmp31_, &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp30_ = processor;
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_process (_tmp30_, &_inner_error_);
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2637 "RawSupport.c"
+#line 2706 "RawSupport.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp32_ = processor;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	image = _tmp33_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp31_ = processor;
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp32_ = graw_processor_make_mem_image (_tmp31_, &_inner_error_);
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	image = _tmp32_;
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2653 "RawSupport.c"
+#line 2722 "RawSupport.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp34_ = image;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp36_ = _tmp35_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp37_ = *scaled;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp39_ = _tmp38_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (_tmp36_);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = _tmp39_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp33_ = image;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_ = graw_processed_image_get_pixbuf_copy (_tmp33_);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp35_ = _tmp34_;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp36_ = *scaled;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_ = resize_pixbuf (_tmp35_, &_tmp36_, GDK_INTERP_BILINEAR);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp38_ = _tmp37_;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (_tmp35_);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	result = _tmp38_;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (image);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2677 "RawSupport.c"
+#line 2746 "RawSupport.c"
 }
 
 
-static void raw_reader_class_init (RawReaderClass * klass) {
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+static void
+raw_reader_class_init (RawReaderClass * klass)
+{
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_reader_parent_class = g_type_class_peek_parent (klass);
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata;
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read;
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
-#line 2690 "RawSupport.c"
+#line 2761 "RawSupport.c"
 }
 
 
-static void raw_reader_instance_init (RawReader * self) {
+static void
+raw_reader_instance_init (RawReader * self)
+{
 }
 
 
-GType raw_reader_get_type (void) {
+GType
+raw_reader_get_type (void)
+{
 	static volatile gsize raw_reader_type_id__volatile = 0;
 	if (g_once_init_enter (&raw_reader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RawReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawReader), 0, (GInstanceInitFunc) raw_reader_instance_init, NULL };
@@ -2706,541 +2781,536 @@ GType raw_reader_get_type (void) {
 }
 
 
-RawDeveloper* raw_developer_as_array (int* result_length1) {
+RawDeveloper*
+raw_developer_as_array (int* result_length1)
+{
 	RawDeveloper* result = NULL;
 	RawDeveloper* _tmp0_;
 	RawDeveloper* _tmp1_;
 	gint _tmp1__length1;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_new0 (RawDeveloper, 3);
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[0] = RAW_DEVELOPER_SHOTWELL;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[1] = RAW_DEVELOPER_CAMERA;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[2] = RAW_DEVELOPER_EMBEDDED;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = 3;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (result_length1) {
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 2731 "RawSupport.c"
+#line 2808 "RawSupport.c"
 	}
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp1_;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2737 "RawSupport.c"
+#line 2814 "RawSupport.c"
 }
 
 
-gchar* raw_developer_to_string (RawDeveloper self) {
+gchar*
+raw_developer_to_string (RawDeveloper self)
+{
 	gchar* result = NULL;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2747 "RawSupport.c"
+#line 2826 "RawSupport.c"
 		{
 			gchar* _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup ("SHOTWELL");
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2756 "RawSupport.c"
+#line 2835 "RawSupport.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 2760 "RawSupport.c"
+#line 2839 "RawSupport.c"
 		{
 			gchar* _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup ("CAMERA");
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2769 "RawSupport.c"
+#line 2848 "RawSupport.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2773 "RawSupport.c"
+#line 2852 "RawSupport.c"
 		{
 			gchar* _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = g_strdup ("EMBEDDED");
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2782 "RawSupport.c"
+#line 2861 "RawSupport.c"
 		}
 		default:
 		{
-#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2788 "RawSupport.c"
+#line 2867 "RawSupport.c"
 		}
 	}
 }
 
 
-RawDeveloper raw_developer_from_string (const gchar* value) {
+RawDeveloper
+raw_developer_from_string (const gchar* value)
+{
 	RawDeveloper result = 0;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	GQuark _tmp3_ = 0U;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	static GQuark _tmp2_label0 = 0;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	static GQuark _tmp2_label1 = 0;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	static GQuark _tmp2_label2 = 0;
-#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	GQuark _tmp2_ = 0U;
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	static GQuark _tmp1_label0 = 0;
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	static GQuark _tmp1_label1 = 0;
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	static GQuark _tmp1_label2 = 0;
+#line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (value != NULL, 0);
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = value;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = _tmp0_;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_);
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("SHOTWELL")))) {
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2817 "RawSupport.c"
+#line 2895 "RawSupport.c"
 			default:
 			{
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_SHOTWELL;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2824 "RawSupport.c"
+#line 2902 "RawSupport.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	} else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("CAMERA")))) {
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2830 "RawSupport.c"
+#line 2908 "RawSupport.c"
 			default:
 			{
-#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_CAMERA;
-#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2837 "RawSupport.c"
+#line 2915 "RawSupport.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	} else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("EMBEDDED")))) {
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2843 "RawSupport.c"
+#line 2921 "RawSupport.c"
 			default:
 			{
-#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_EMBEDDED;
-#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2850 "RawSupport.c"
+#line 2928 "RawSupport.c"
 			}
 		}
 	} else {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2856 "RawSupport.c"
+#line 2934 "RawSupport.c"
 			default:
 			{
-#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				g_assert_not_reached ();
-#line 2861 "RawSupport.c"
+#line 2939 "RawSupport.c"
 			}
 		}
 	}
 }
 
 
-gchar* raw_developer_get_label (RawDeveloper self) {
+gchar*
+raw_developer_get_label (RawDeveloper self)
+{
 	gchar* result = NULL;
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2874 "RawSupport.c"
+#line 2954 "RawSupport.c"
 		{
 			gchar* _tmp0_;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup (_ ("Shotwell"));
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2883 "RawSupport.c"
+#line 2963 "RawSupport.c"
 		}
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2889 "RawSupport.c"
+#line 2969 "RawSupport.c"
 		{
 			gchar* _tmp1_;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup (_ ("Camera"));
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2898 "RawSupport.c"
+#line 2978 "RawSupport.c"
 		}
 		default:
 		{
-#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2904 "RawSupport.c"
+#line 2984 "RawSupport.c"
 		}
 	}
 }
 
 
-gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
+gboolean
+raw_developer_is_equivalent (RawDeveloper self,
+                             RawDeveloper d)
+{
 	gboolean result = FALSE;
-	RawDeveloper _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp0_ = d;
-#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (self == _tmp0_) {
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (self == d) {
+#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2923 "RawSupport.c"
+#line 3003 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == RAW_DEVELOPER_CAMERA) {
-#line 2927 "RawSupport.c"
-		RawDeveloper _tmp3_;
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp3_ = d;
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2933 "RawSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp1_ = d == RAW_DEVELOPER_EMBEDDED;
+#line 3009 "RawSupport.c"
 	} else {
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp2_ = FALSE;
-#line 2937 "RawSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp1_ = FALSE;
+#line 3013 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp2_) {
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp1_ = TRUE;
-#line 2943 "RawSupport.c"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (_tmp1_) {
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp0_ = TRUE;
+#line 3019 "RawSupport.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		gboolean _tmp2_ = FALSE;
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2948 "RawSupport.c"
-			RawDeveloper _tmp5_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp5_ = d;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2954 "RawSupport.c"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp2_ = d == RAW_DEVELOPER_CAMERA;
+#line 3026 "RawSupport.c"
 		} else {
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp4_ = FALSE;
-#line 2958 "RawSupport.c"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp2_ = FALSE;
+#line 3030 "RawSupport.c"
 		}
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp1_ = _tmp4_;
-#line 2962 "RawSupport.c"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp0_ = _tmp2_;
+#line 3034 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp1_) {
-#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (_tmp0_) {
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2970 "RawSupport.c"
+#line 3042 "RawSupport.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = FALSE;
-#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2976 "RawSupport.c"
+#line 3048 "RawSupport.c"
 }
 
 
-BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) {
+BackingPhotoRow*
+raw_developer_create_backing_row_for_development (RawDeveloper self,
+                                                  const gchar* raw_filepath,
+                                                  const gchar* camera_development_filename,
+                                                  GError** error)
+{
 	BackingPhotoRow* result = NULL;
 	BackingPhotoRow* ns = NULL;
 	BackingPhotoRow* _tmp0_;
 	GFile* master = NULL;
-	const gchar* _tmp1_;
-	GFile* _tmp2_;
+	GFile* _tmp1_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	GFile* _tmp3_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
 	gchar* basename = NULL;
-	const gchar* _tmp8_;
 	gchar* newbasename = NULL;
-	const gchar* _tmp27_;
-	gchar* _tmp28_;
+	const gchar* _tmp24_;
+	gchar* _tmp25_;
 	gboolean c = FALSE;
 	GFile* new_back = NULL;
-	GFile* _tmp29_;
-	GFile* _tmp30_;
+	GFile* _tmp26_;
+	GFile* _tmp27_;
+	GFile* _tmp28_;
+	const gchar* _tmp29_;
+	gboolean _tmp30_ = FALSE;
 	GFile* _tmp31_;
-	const gchar* _tmp32_;
-	gboolean _tmp33_ = FALSE;
-	GFile* _tmp34_;
-	GFile* _tmp35_;
+	GFile* _tmp32_;
+	GFile* _tmp33_;
+	BackingPhotoRow* _tmp34_;
+	BackingPhotoRow* _tmp35_;
 	GFile* _tmp36_;
-	BackingPhotoRow* _tmp37_;
-	BackingPhotoRow* _tmp38_;
-	GFile* _tmp39_;
-	gchar* _tmp40_;
+	gchar* _tmp37_;
 	GError * _inner_error_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (raw_filepath != NULL, NULL);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ns = _tmp0_;
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = raw_filepath;
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	master = _tmp2_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp3_ = master;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp4_ = g_file_get_basename (_tmp3_);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp5_ = _tmp4_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp1_ = g_file_new_for_path (raw_filepath);
+#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	master = _tmp1_;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp2_ = master;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp3_ = g_file_get_basename (_tmp2_);
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp4_ = _tmp3_;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	disassemble_filename (_tmp4_, &_tmp5_, &_tmp6_);
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	name = _tmp6_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	name = _tmp5_;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	ext = _tmp7_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp5_);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp8_ = camera_development_filename;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp8_ == NULL) {
-#line 3048 "RawSupport.c"
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp16_;
-		gchar* _tmp17_;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	ext = _tmp6_;
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (_tmp4_);
+#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (camera_development_filename == NULL) {
+#line 3119 "RawSupport.c"
+		gchar* _tmp7_ = NULL;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		const gchar* _tmp17_;
 		gchar* _tmp18_;
-		const gchar* _tmp19_;
+		gchar* _tmp19_;
 		gchar* _tmp20_;
 		gchar* _tmp21_;
 		gchar* _tmp22_;
-		gchar* _tmp23_;
-		gchar* _tmp24_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self != RAW_DEVELOPER_CAMERA) {
-#line 3061 "RawSupport.c"
+#line 3132 "RawSupport.c"
+			gchar* _tmp8_;
+			gchar* _tmp9_;
 			gchar* _tmp10_;
 			gchar* _tmp11_;
 			gchar* _tmp12_;
-			gchar* _tmp13_;
-			gchar* _tmp14_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp10_ = raw_developer_to_string (self);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp8_ = raw_developer_to_string (self);
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp9_ = _tmp8_;
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1);
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp13_ = _tmp12_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp14_ = g_strconcat ("_", _tmp13_, NULL);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp9_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp9_ = _tmp14_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp13_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp12_ = g_strconcat ("_", _tmp11_, NULL);
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_g_free0 (_tmp7_);
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp7_ = _tmp12_;
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp11_);
-#line 3085 "RawSupport.c"
-		} else {
-			gchar* _tmp15_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp15_ = g_strdup ("");
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp9_ = _tmp15_;
-#line 3094 "RawSupport.c"
+#line 3156 "RawSupport.c"
+		} else {
+			gchar* _tmp13_;
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp13_ = g_strdup ("");
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_g_free0 (_tmp7_);
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp7_ = _tmp13_;
+#line 3165 "RawSupport.c"
 		}
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp16_ = name;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp17_ = g_strconcat (_tmp16_, "_", NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp18_ = _tmp17_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp19_ = ext;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp14_ = name;
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp15_ = g_strconcat (_tmp14_, "_", NULL);
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp16_ = _tmp15_;
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp17_ = ext;
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL);
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp19_ = _tmp18_;
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp20_ = g_strconcat (_tmp19_, _tmp7_, NULL);
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp21_ = _tmp20_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp23_ = _tmp22_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp22_ = g_strconcat (_tmp21_, ".jpg", NULL);
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		basename = _tmp24_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp23_);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		basename = _tmp22_;
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp21_);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp18_);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp9_);
-#line 3126 "RawSupport.c"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp19_);
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp16_);
+#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp7_);
+#line 3197 "RawSupport.c"
 	} else {
-		const gchar* _tmp25_;
-		gchar* _tmp26_;
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp25_ = camera_development_filename;
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp26_ = g_strdup (_tmp25_);
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		gchar* _tmp23_;
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp23_ = g_strdup (camera_development_filename);
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		basename = _tmp26_;
-#line 3138 "RawSupport.c"
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		basename = _tmp23_;
+#line 3206 "RawSupport.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp27_ = basename;
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp28_ = library_files_convert_basename (_tmp27_);
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	newbasename = _tmp28_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp29_ = master;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp30_ = g_file_get_parent (_tmp29_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp31_ = _tmp30_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp32_ = newbasename;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	c = _tmp33_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp35_ = _tmp34_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (_tmp31_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	new_back = _tmp35_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp24_ = basename;
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp25_ = library_files_convert_basename (_tmp24_);
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	newbasename = _tmp25_;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp26_ = master;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp27_ = g_file_get_parent (_tmp26_);
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp28_ = _tmp27_;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp29_ = newbasename;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp31_ = generate_unique_file (_tmp28_, _tmp29_, &_tmp30_, &_inner_error_);
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	c = _tmp30_;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp32_ = _tmp31_;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (_tmp28_);
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	new_back = _tmp32_;
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (newbasename);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3182 "RawSupport.c"
+#line 3250 "RawSupport.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp36_ = new_back;
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	claim_file (_tmp36_, &_inner_error_);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp33_ = new_back;
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	claim_file (_tmp33_, &_inner_error_);
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (new_back);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (newbasename);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3208 "RawSupport.c"
+#line 3276 "RawSupport.c"
 	}
-#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp37_ = ns;
-#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp38_ = ns;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp39_ = new_back;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp40_ = g_file_get_path (_tmp39_);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp38_->filepath);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp38_->filepath = _tmp40_;
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_ = ns;
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_->file_format = PHOTO_FILE_FORMAT_JFIF;
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp35_ = ns;
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp36_ = new_back;
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_ = g_file_get_path (_tmp36_);
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (_tmp35_->filepath);
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp35_->filepath = _tmp37_;
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = ns;
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (new_back);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (newbasename);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (basename);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (master);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 3240 "RawSupport.c"
+#line 3308 "RawSupport.c"
 }
 
 
-GType raw_developer_get_type (void) {
+GType
+raw_developer_get_type (void)
+{
 	static volatile gsize raw_developer_type_id__volatile = 0;
 	if (g_once_init_enter (&raw_developer_type_id__volatile)) {
 		static const GEnumValue values[] = {{RAW_DEVELOPER_SHOTWELL, "RAW_DEVELOPER_SHOTWELL", "shotwell"}, {RAW_DEVELOPER_CAMERA, "RAW_DEVELOPER_CAMERA", "camera"}, {RAW_DEVELOPER_EMBEDDED, "RAW_DEVELOPER_EMBEDDED", "embedded"}, {0, NULL, NULL}};
author	Jörg Frings-Fürst <debian@jff.email>	2018-07-09 12:10:38 +0200
committer	Jörg Frings-Fürst <debian@jff.email>	2018-07-09 12:10:38 +0200
commit	709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree	496b2f3899e1d5728ee9ae76095cc5056c317447 /src/photos/RawSupport.c
parent	f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent	5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)