Merge branch 'feature/upstream' into develop

1 files changed, 397 insertions, 252 deletions

diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 4f46fdc..72dcc4f 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.40.4, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -19,6 +19,7 @@
 /* atomicity on the filesystem.*/
 /**/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -202,17 +203,22 @@ static gpointer photo_file_metadata_writer_parent_class = NULL;
 
 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_format_get_type (void) G_GNUC_CONST;
 #define PHOTO_FILE_ADAPTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapterPrivate))
-enum  {
-	PHOTO_FILE_ADAPTER_DUMMY_PROPERTY
-};
-PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
+PhotoFileAdapter* photo_file_adapter_construct (GType object_type,
+                                                const gchar* filepath,
+                                                PhotoFileFormat file_format);
 gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self);
 gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self);
 GFile* photo_file_adapter_get_file (PhotoFileAdapter* self);
@@ -221,9 +227,15 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj);
 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;
@@ -232,91 +244,117 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
 #define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate))
-enum  {
-	PHOTO_FILE_READER_DUMMY_PROPERTY
-};
-PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
+PhotoFileReader* photo_file_reader_construct (GType object_type,
+                                              const gchar* filepath,
+                                              PhotoFileFormat file_format);
 GType photo_file_writer_get_type (void) G_GNUC_CONST;
 GQuark photo_format_error_quark (void);
-PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error);
-PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error);
+PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self,
+                                                  GError** error);
+PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self,
+                                                  const gchar* filepath,
+                                                  GError** error);
 GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST;
-PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error);
-PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error);
-PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
-static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error);
-GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error);
-static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error);
-GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
-static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
-GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
-void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
+PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self,
+                                                                   GError** error);
+PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self,
+                                                                   const gchar* filepath,
+                                                                   GError** error);
+PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self,
+                                                GError** error);
+static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self,
+                                                     GError** error);
+GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self,
+                                            GError** error);
+static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self,
+                                                 GError** error);
+GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self,
+                                          Dimensions* full,
+                                          Dimensions* scaled,
+                                          GError** error);
+static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self,
+                                               Dimensions* full,
+                                               Dimensions* scaled,
+                                               GError** error);
+GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf,
+                          Dimensions* resized,
+                          GdkInterpType interp);
+void photo_file_reader_set_role (PhotoFileReader* self,
+                                 PhotoFileReaderRole role);
 PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
 static void photo_file_reader_finalize (PhotoFileAdapter * obj);
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
-enum  {
-	PHOTO_FILE_WRITER_DUMMY_PROPERTY
-};
-PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
+PhotoFileWriter* photo_file_writer_construct (GType object_type,
+                                              const gchar* filepath,
+                                              PhotoFileFormat file_format);
 PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self);
-PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath);
-void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error);
-static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error);
-enum  {
-	PHOTO_FILE_METADATA_WRITER_DUMMY_PROPERTY
-};
-PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format);
+PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self,
+                                                  const gchar* filepath);
+void photo_file_writer_write (PhotoFileWriter* self,
+                              GdkPixbuf* pixbuf,
+                              JpegQuality quality,
+                              GError** error);
+static void photo_file_writer_real_write (PhotoFileWriter* self,
+                                   GdkPixbuf* pixbuf,
+                                   JpegQuality quality,
+                                   GError** error);
+PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type,
+                                                               const gchar* filepath,
+                                                               PhotoFileFormat file_format);
 PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self);
-void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error);
-static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error);
-
-
-PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
+void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self,
+                                                PhotoMetadata* metadata,
+                                                GError** error);
+static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self,
+                                                     PhotoMetadata* metadata,
+                                                     GError** error);
+
+
+PhotoFileAdapter*
+photo_file_adapter_construct (GType object_type,
+                              const gchar* filepath,
+                              PhotoFileFormat file_format)
+{
 	PhotoFileAdapter* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	PhotoFileFormat _tmp2_;
+	gchar* _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileAdapter*) g_type_create_instance (object_type);
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = filepath;
-#line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (filepath);
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (self->priv->filepath);
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self->priv->filepath = _tmp1_;
-#line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp2_ = file_format;
+	self->priv->filepath = _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self->priv->file_format = _tmp2_;
+	self->priv->file_format = file_format;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 298 "PhotoFileAdapter.c"
+#line 335 "PhotoFileAdapter.c"
 }
 
 
-gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
+gboolean
+photo_file_adapter_file_exists (PhotoFileAdapter* self)
+{
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
-	gboolean _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = self->priv->filepath;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	result = _tmp1_;
+	result = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 316 "PhotoFileAdapter.c"
+#line 352 "PhotoFileAdapter.c"
 }
 
 
-gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
+gchar*
+photo_file_adapter_get_filepath (PhotoFileAdapter* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -330,31 +368,35 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
 	result = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 334 "PhotoFileAdapter.c"
+#line 372 "PhotoFileAdapter.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 341 "PhotoFileAdapter.c"
+#line 381 "PhotoFileAdapter.c"
 }
 
 
-GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
+GFile*
+photo_file_adapter_get_file (PhotoFileAdapter* self)
+{
 	GFile* result = NULL;
 	GFile* _result_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
-#line 351 "PhotoFileAdapter.c"
+#line 393 "PhotoFileAdapter.c"
 	{
 		GFile* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		_tmp0_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_rec_mutex_lock (&self->priv->__lock_file);
-#line 358 "PhotoFileAdapter.c"
+#line 400 "PhotoFileAdapter.c"
 		{
 			GFile* _tmp1_;
 			GFile* _tmp4_;
@@ -363,7 +405,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp1_ = self->priv->file;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			if (_tmp1_ == NULL) {
-#line 367 "PhotoFileAdapter.c"
+#line 409 "PhotoFileAdapter.c"
 				const gchar* _tmp2_;
 				GFile* _tmp3_;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -374,7 +416,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 				_g_object_unref0 (self->priv->file);
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 				self->priv->file = _tmp3_;
-#line 378 "PhotoFileAdapter.c"
+#line 420 "PhotoFileAdapter.c"
 			}
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_tmp4_ = self->priv->file;
@@ -384,7 +426,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_g_object_unref0 (_result_);
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_result_ = _tmp5_;
-#line 388 "PhotoFileAdapter.c"
+#line 430 "PhotoFileAdapter.c"
 		}
 		__finally28:
 		{
@@ -393,7 +435,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp6_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_file);
-#line 397 "PhotoFileAdapter.c"
+#line 439 "PhotoFileAdapter.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -405,18 +447,20 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			g_clear_error (&_inner_error_);
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 409 "PhotoFileAdapter.c"
+#line 451 "PhotoFileAdapter.c"
 		}
 	}
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _result_;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 416 "PhotoFileAdapter.c"
+#line 458 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
+PhotoFileFormat
+photo_file_adapter_get_file_format (PhotoFileAdapter* self)
+{
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_;
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -427,108 +471,133 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 431 "PhotoFileAdapter.c"
+#line 475 "PhotoFileAdapter.c"
 }
 
 
-static void value_photo_file_adapter_init (GValue* value) {
+static void
+value_photo_file_adapter_init (GValue* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	value->data[0].v_pointer = NULL;
-#line 438 "PhotoFileAdapter.c"
+#line 484 "PhotoFileAdapter.c"
 }
 
 
-static void value_photo_file_adapter_free_value (GValue* value) {
+static void
+value_photo_file_adapter_free_value (GValue* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (value->data[0].v_pointer);
-#line 447 "PhotoFileAdapter.c"
+#line 495 "PhotoFileAdapter.c"
 	}
 }
 
 
-static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_photo_file_adapter_copy_value (const GValue* src_value,
+                                     GValue* dest_value)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer);
-#line 457 "PhotoFileAdapter.c"
+#line 508 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 461 "PhotoFileAdapter.c"
+#line 512 "PhotoFileAdapter.c"
 	}
 }
 
 
-static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) {
+static gpointer
+value_photo_file_adapter_peek_pointer (const GValue* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 469 "PhotoFileAdapter.c"
+#line 522 "PhotoFileAdapter.c"
 }
 
 
-static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_photo_file_adapter_collect_value (GValue* value,
+                                        guint n_collect_values,
+                                        GTypeCValue* collect_values,
+                                        guint collect_flags)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (collect_values[0].v_pointer) {
-#line 476 "PhotoFileAdapter.c"
+#line 534 "PhotoFileAdapter.c"
 		PhotoFileAdapter * object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 483 "PhotoFileAdapter.c"
+#line 541 "PhotoFileAdapter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 487 "PhotoFileAdapter.c"
+#line 545 "PhotoFileAdapter.c"
 		}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = photo_file_adapter_ref (object);
-#line 491 "PhotoFileAdapter.c"
+#line 549 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 495 "PhotoFileAdapter.c"
+#line 553 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 499 "PhotoFileAdapter.c"
+#line 557 "PhotoFileAdapter.c"
 }
 
 
-static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_photo_file_adapter_lcopy_value (const GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 	PhotoFileAdapter ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (!object_p) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 510 "PhotoFileAdapter.c"
+#line 573 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = NULL;
-#line 516 "PhotoFileAdapter.c"
+#line 579 "PhotoFileAdapter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 520 "PhotoFileAdapter.c"
+#line 583 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = photo_file_adapter_ref (value->data[0].v_pointer);
-#line 524 "PhotoFileAdapter.c"
+#line 587 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 528 "PhotoFileAdapter.c"
+#line 591 "PhotoFileAdapter.c"
 }
 
 
-GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_photo_file_adapter (const gchar* name,
+                               const gchar* nick,
+                               const gchar* blurb,
+                               GType object_type,
+                               GParamFlags flags)
+{
 	ParamSpecPhotoFileAdapter* spec;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_ADAPTER), NULL);
@@ -538,20 +607,25 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return G_PARAM_SPEC (spec);
-#line 542 "PhotoFileAdapter.c"
+#line 611 "PhotoFileAdapter.c"
 }
 
 
-gpointer value_get_photo_file_adapter (const GValue* value) {
+gpointer
+value_get_photo_file_adapter (const GValue* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 551 "PhotoFileAdapter.c"
+#line 622 "PhotoFileAdapter.c"
 }
 
 
-void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
+void
+value_set_photo_file_adapter (GValue* value,
+                              gpointer v_object)
+{
 	PhotoFileAdapter * old;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER));
@@ -567,22 +641,25 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_ref (value->data[0].v_pointer);
-#line 571 "PhotoFileAdapter.c"
+#line 645 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 575 "PhotoFileAdapter.c"
+#line 649 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 581 "PhotoFileAdapter.c"
+#line 655 "PhotoFileAdapter.c"
 	}
 }
 
 
-void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
+void
+value_take_photo_file_adapter (GValue* value,
+                               gpointer v_object)
+{
 	PhotoFileAdapter * old;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER));
@@ -596,33 +673,37 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = v_object;
-#line 600 "PhotoFileAdapter.c"
+#line 677 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 604 "PhotoFileAdapter.c"
+#line 681 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 610 "PhotoFileAdapter.c"
+#line 687 "PhotoFileAdapter.c"
 	}
 }
 
 
-static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) {
+static void
+photo_file_adapter_class_init (PhotoFileAdapterClass * klass)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_adapter_parent_class = g_type_class_peek_parent (klass);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate));
-#line 622 "PhotoFileAdapter.c"
+#line 701 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
+static void
+photo_file_adapter_instance_init (PhotoFileAdapter * self)
+{
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->priv = PHOTO_FILE_ADAPTER_GET_PRIVATE (self);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -631,11 +712,13 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
 	self->priv->file = NULL;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->ref_count = 1;
-#line 635 "PhotoFileAdapter.c"
+#line 716 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_adapter_finalize (PhotoFileAdapter * obj) {
+static void
+photo_file_adapter_finalize (PhotoFileAdapter * obj)
+{
 	PhotoFileAdapter * self;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter);
@@ -647,11 +730,13 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj) {
 	g_rec_mutex_clear (&self->priv->__lock_file);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_object_unref0 (self->priv->file);
-#line 651 "PhotoFileAdapter.c"
+#line 734 "PhotoFileAdapter.c"
 }
 
 
-GType photo_file_adapter_get_type (void) {
+GType
+photo_file_adapter_get_type (void)
+{
 	static volatile gsize photo_file_adapter_type_id__volatile = 0;
 	if (g_once_init_enter (&photo_file_adapter_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_photo_file_adapter_init, value_photo_file_adapter_free_value, value_photo_file_adapter_copy_value, value_photo_file_adapter_peek_pointer, "p", value_photo_file_adapter_collect_value, "p", value_photo_file_adapter_lcopy_value };
@@ -665,18 +750,22 @@ GType photo_file_adapter_get_type (void) {
 }
 
 
-gpointer photo_file_adapter_ref (gpointer instance) {
+gpointer
+photo_file_adapter_ref (gpointer instance)
+{
 	PhotoFileAdapter * self;
 	self = instance;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return instance;
-#line 676 "PhotoFileAdapter.c"
+#line 763 "PhotoFileAdapter.c"
 }
 
 
-void photo_file_adapter_unref (gpointer instance) {
+void
+photo_file_adapter_unref (gpointer instance)
+{
 	PhotoFileAdapter * self;
 	self = instance;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -685,12 +774,14 @@ void photo_file_adapter_unref (gpointer instance) {
 		PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 689 "PhotoFileAdapter.c"
+#line 778 "PhotoFileAdapter.c"
 	}
 }
 
 
-GType photo_file_reader_role_get_type (void) {
+GType
+photo_file_reader_role_get_type (void)
+{
 	static volatile gsize photo_file_reader_role_type_id__volatile = 0;
 	if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) {
 		static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}};
@@ -702,50 +793,48 @@ GType photo_file_reader_role_get_type (void) {
 }
 
 
-PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
+PhotoFileReader*
+photo_file_reader_construct (GType object_type,
+                             const gchar* filepath,
+                             PhotoFileFormat file_format)
+{
 	PhotoFileReader* self = NULL;
-	const gchar* _tmp0_;
-	PhotoFileFormat _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = filepath;
-#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = file_format;
-#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
+	self = (PhotoFileReader*) photo_file_adapter_construct (object_type, filepath, file_format);
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 720 "PhotoFileAdapter.c"
+#line 809 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) {
+PhotoFileWriter*
+photo_file_reader_create_writer (PhotoFileReader* self,
+                                 GError** error)
+{
 	PhotoFileWriter* result = NULL;
 	PhotoFileWriter* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
+	PhotoFileWriter* _tmp3_;
 	PhotoFileWriter* _tmp4_;
 	PhotoFileWriter* _tmp5_;
-	PhotoFileWriter* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_);
+	_tmp3_ = photo_file_format_create_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = _tmp5_;
+	_tmp0_ = _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -754,7 +843,7 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
 			g_propagate_error (error, _inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 758 "PhotoFileAdapter.c"
+#line 847 "PhotoFileAdapter.c"
 		} else {
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -762,49 +851,49 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
 			g_clear_error (&_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 766 "PhotoFileAdapter.c"
+#line 855 "PhotoFileAdapter.c"
 		}
 	}
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp6_ = _tmp0_;
+	_tmp5_ = _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
 #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 779 "PhotoFileAdapter.c"
+#line 868 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) {
+PhotoFileMetadataWriter*
+photo_file_reader_create_metadata_writer (PhotoFileReader* self,
+                                          GError** error)
+{
 	PhotoFileMetadataWriter* result = NULL;
 	PhotoFileMetadataWriter* _tmp0_ = NULL;
-	PhotoFileFormat _tmp1_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
+	PhotoFileMetadataWriter* _tmp3_;
 	PhotoFileMetadataWriter* _tmp4_;
 	PhotoFileMetadataWriter* _tmp5_;
-	PhotoFileMetadataWriter* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_);
+	_tmp3_ = photo_file_format_create_metadata_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = _tmp5_;
+	_tmp0_ = _tmp4_;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -813,7 +902,7 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
 			g_propagate_error (error, _inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 817 "PhotoFileAdapter.c"
+#line 906 "PhotoFileAdapter.c"
 		} else {
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -821,60 +910,77 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
 			g_clear_error (&_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 825 "PhotoFileAdapter.c"
+#line 914 "PhotoFileAdapter.c"
 		}
 	}
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp6_ = _tmp0_;
+	_tmp5_ = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	result = _tmp6_;
+	result = _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 838 "PhotoFileAdapter.c"
+#line 927 "PhotoFileAdapter.c"
 }
 
 
-static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) {
+static PhotoMetadata*
+photo_file_reader_real_read_metadata (PhotoFileReader* self,
+                                      GError** error)
+{
 #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 847 "PhotoFileAdapter.c"
+#line 939 "PhotoFileAdapter.c"
 }
 
 
-PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) {
+PhotoMetadata*
+photo_file_reader_read_metadata (PhotoFileReader* self,
+                                 GError** error)
+{
 #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
 #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error);
-#line 856 "PhotoFileAdapter.c"
+#line 951 "PhotoFileAdapter.c"
 }
 
 
-static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) {
+static GdkPixbuf*
+photo_file_reader_real_unscaled_read (PhotoFileReader* self,
+                                      GError** error)
+{
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 865 "PhotoFileAdapter.c"
+#line 963 "PhotoFileAdapter.c"
 }
 
 
-GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) {
+GdkPixbuf*
+photo_file_reader_unscaled_read (PhotoFileReader* self,
+                                 GError** error)
+{
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error);
-#line 874 "PhotoFileAdapter.c"
+#line 975 "PhotoFileAdapter.c"
 }
 
 
-static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
+static GdkPixbuf*
+photo_file_reader_real_scaled_read (PhotoFileReader* self,
+                                    Dimensions* full,
+                                    Dimensions* scaled,
+                                    GError** error)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_;
@@ -895,7 +1001,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
 		g_propagate_error (error, _inner_error_);
 #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return NULL;
-#line 899 "PhotoFileAdapter.c"
+#line 1005 "PhotoFileAdapter.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = *scaled;
@@ -907,32 +1013,39 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
 	_g_object_unref0 (_tmp0_);
 #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 911 "PhotoFileAdapter.c"
+#line 1017 "PhotoFileAdapter.c"
 }
 
 
-GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
+GdkPixbuf*
+photo_file_reader_scaled_read (PhotoFileReader* self,
+                               Dimensions* full,
+                               Dimensions* scaled,
+                               GError** error)
+{
 #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
 #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error);
-#line 920 "PhotoFileAdapter.c"
+#line 1031 "PhotoFileAdapter.c"
 }
 
 
-void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) {
-	PhotoFileReaderRole _tmp0_;
+void
+photo_file_reader_set_role (PhotoFileReader* self,
+                            PhotoFileReaderRole role)
+{
 #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_READER (self));
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = role;
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self->priv->role = _tmp0_;
-#line 932 "PhotoFileAdapter.c"
+	self->priv->role = role;
+#line 1043 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
+PhotoFileReaderRole
+photo_file_reader_get_role (PhotoFileReader* self)
+{
 	PhotoFileReaderRole result = 0;
 	PhotoFileReaderRole _tmp0_;
 #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -943,11 +1056,13 @@ PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
 	result = _tmp0_;
 #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 947 "PhotoFileAdapter.c"
+#line 1060 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
+static void
+photo_file_reader_class_init (PhotoFileReaderClass * klass)
+{
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_reader_parent_class = g_type_class_peek_parent (klass);
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -960,30 +1075,36 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
 	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read;
-#line 964 "PhotoFileAdapter.c"
+#line 1079 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_reader_instance_init (PhotoFileReader * self) {
+static void
+photo_file_reader_instance_init (PhotoFileReader * self)
+{
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->priv = PHOTO_FILE_READER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT;
-#line 973 "PhotoFileAdapter.c"
+#line 1090 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_reader_finalize (PhotoFileAdapter * obj) {
+static void
+photo_file_reader_finalize (PhotoFileAdapter * obj)
+{
 	PhotoFileReader * self;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj);
-#line 983 "PhotoFileAdapter.c"
+#line 1102 "PhotoFileAdapter.c"
 }
 
 
-GType photo_file_reader_get_type (void) {
+GType
+photo_file_reader_get_type (void)
+{
 	static volatile gsize photo_file_reader_type_id__volatile = 0;
 	if (g_once_init_enter (&photo_file_reader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotoFileReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileReader), 0, (GInstanceInitFunc) photo_file_reader_instance_init, NULL };
@@ -995,85 +1116,98 @@ GType photo_file_reader_get_type (void) {
 }
 
 
-PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
+PhotoFileWriter*
+photo_file_writer_construct (GType object_type,
+                             const gchar* filepath,
+                             PhotoFileFormat file_format)
+{
 	PhotoFileWriter* self = NULL;
-	const gchar* _tmp0_;
-	PhotoFileFormat _tmp1_;
 #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = filepath;
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = file_format;
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
+	self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, filepath, file_format);
 #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 1013 "PhotoFileAdapter.c"
+#line 1132 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) {
+PhotoFileReader*
+photo_file_writer_create_reader (PhotoFileWriter* self)
+{
 	PhotoFileReader* result = NULL;
-	PhotoFileFormat _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
+	PhotoFileReader* _tmp2_;
 	PhotoFileReader* _tmp3_;
-	PhotoFileReader* _tmp4_;
 #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL);
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
+	_tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_);
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 1042 "PhotoFileAdapter.c"
+#line 1160 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
+static void
+photo_file_writer_real_write (PhotoFileWriter* self,
+                              GdkPixbuf* pixbuf,
+                              JpegQuality quality,
+                              GError** error)
+{
 #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 1051 "PhotoFileAdapter.c"
+#line 1174 "PhotoFileAdapter.c"
 }
 
 
-void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
+void
+photo_file_writer_write (PhotoFileWriter* self,
+                         GdkPixbuf* pixbuf,
+                         JpegQuality quality,
+                         GError** error)
+{
 #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_WRITER (self));
 #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error);
-#line 1060 "PhotoFileAdapter.c"
+#line 1188 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
+static void
+photo_file_writer_class_init (PhotoFileWriterClass * klass)
+{
 #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_writer_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write;
-#line 1069 "PhotoFileAdapter.c"
+#line 1199 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_writer_instance_init (PhotoFileWriter * self) {
+static void
+photo_file_writer_instance_init (PhotoFileWriter * self)
+{
 }
 
 
-GType photo_file_writer_get_type (void) {
+GType
+photo_file_writer_get_type (void)
+{
 	static volatile gsize photo_file_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photo_file_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotoFileWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileWriter), 0, (GInstanceInitFunc) photo_file_writer_instance_init, NULL };
@@ -1085,85 +1219,96 @@ GType photo_file_writer_get_type (void) {
 }
 
 
-PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) {
+PhotoFileMetadataWriter*
+photo_file_metadata_writer_construct (GType object_type,
+                                      const gchar* filepath,
+                                      PhotoFileFormat file_format)
+{
 	PhotoFileMetadataWriter* self = NULL;
-	const gchar* _tmp0_;
-	PhotoFileFormat _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = filepath;
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = file_format;
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
+	self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, filepath, file_format);
 #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 1103 "PhotoFileAdapter.c"
+#line 1235 "PhotoFileAdapter.c"
 }
 
 
-PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) {
+PhotoFileReader*
+photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self)
+{
 	PhotoFileReader* result = NULL;
-	PhotoFileFormat _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
+	PhotoFileReader* _tmp2_;
 	PhotoFileReader* _tmp3_;
-	PhotoFileReader* _tmp4_;
 #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL);
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
+	_tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_);
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 1132 "PhotoFileAdapter.c"
+#line 1263 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
+static void
+photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self,
+                                                PhotoMetadata* metadata,
+                                                GError** error)
+{
 #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 1141 "PhotoFileAdapter.c"
+#line 1276 "PhotoFileAdapter.c"
 }
 
 
-void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
+void
+photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self,
+                                           PhotoMetadata* metadata,
+                                           GError** error)
+{
 #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self));
 #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error);
-#line 1150 "PhotoFileAdapter.c"
+#line 1289 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) {
+static void
+photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass)
+{
 #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata;
-#line 1159 "PhotoFileAdapter.c"
+#line 1300 "PhotoFileAdapter.c"
 }
 
 
-static void photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self) {
+static void
+photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self)
+{
 }
 
 
-GType photo_file_metadata_writer_get_type (void) {
+GType
+photo_file_metadata_writer_get_type (void)
+{
 	static volatile gsize photo_file_metadata_writer_type_id__volatile = 0;
 	if (g_once_init_enter (&photo_file_metadata_writer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PhotoFileMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileMetadataWriter), 0, (GInstanceInitFunc) photo_file_metadata_writer_instance_init, NULL };