Merge tag 'upstream/0.24.1'

Upstream version 0.24.1
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-10-19 05:09:43 +0200
commit: 694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree: c098b2104f1b76db60dd1f50de060c4439437fd8 /src/photos
parent: 6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent: b076314018e4b53d745823754a26eb6fb73a2801 (diff)
13 files changed, 748 insertions, 750 deletions
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 11ad8c6..538669d 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.32.1, the Vala compiler
+/* BmpSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from BmpSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1024,7 +1024,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp4__length1 = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 56cfe34..1ee0beb 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.32.1, the Vala compiler
+/* GRaw.c generated by valac 0.34.1, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -498,7 +498,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp10_ = _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp12_ = _tmp11_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index f016592..6c66a3d 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.32.1, the Vala compiler
+/* GdkSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from GdkSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -930,7 +930,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp47__length1 = buffer_length1;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
+			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			bytes_read = (gsize) _tmp48_;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1127,7 +1127,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp69_ = fins;
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 3c86a7a..cd5d127 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.32.1, the Vala compiler
+/* JfifSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from JfifSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1870,7 +1870,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = fins;
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	dins = _tmp1_;
 #line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 2f05603..859ca74 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.34.1, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index 6e05342..f623c3f 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.34.1, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 8d44d6b..7351b3b 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.34.1, the Vala compiler
  * generated from PhotoFileSniffer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 1418eb3..e2a44b3 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.32.1, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.34.1, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -103,7 +103,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 typedef struct _PhotoMetadataPrivate PhotoMetadataPrivate;
 
 #define PHOTO_METADATA_TYPE_SET_OPTION (photo_metadata_set_option_get_type ())
-#define _gexiv2_metadata_free0(var) ((var == NULL) ? NULL : (var = (gexiv2_metadata_free (var), NULL)))
 #define _exif_data_unref0(var) ((var == NULL) ? NULL : (var = (exif_data_unref (var), NULL)))
 
 #define TYPE_PREPARE_INPUT_TEXT_OPTIONS (prepare_input_text_options_get_type ())
@@ -146,7 +145,6 @@ typedef struct _HierarchicalTagIndexClass HierarchicalTagIndexClass;
 
 #define TYPE_RATING (rating_get_type ())
 typedef struct _PhotoMetadataInternalPhotoPreviewPrivate PhotoMetadataInternalPhotoPreviewPrivate;
-#define _gexiv2_preview_image_free0(var) ((var == NULL) ? NULL : (var = (gexiv2_preview_image_free (var), NULL)))
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -672,21 +670,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ
 	self->is_writeable = _tmp5_;
 #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 676 "PhotoMetadata.c"
+#line 674 "PhotoMetadata.c"
 }
 
 
 HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable) {
 #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable);
-#line 683 "PhotoMetadata.c"
+#line 681 "PhotoMetadata.c"
 }
 
 
 static void value_hierarchical_keyword_field_init (GValue* value) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 690 "PhotoMetadata.c"
+#line 688 "PhotoMetadata.c"
 }
 
 
@@ -695,7 +693,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (value->data[0].v_pointer);
-#line 699 "PhotoMetadata.c"
+#line 697 "PhotoMetadata.c"
 	}
 }
 
@@ -705,11 +703,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer);
-#line 709 "PhotoMetadata.c"
+#line 707 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 713 "PhotoMetadata.c"
+#line 711 "PhotoMetadata.c"
 	}
 }
 
@@ -717,37 +715,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
 static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 721 "PhotoMetadata.c"
+#line 719 "PhotoMetadata.c"
 }
 
 
 static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 728 "PhotoMetadata.c"
+#line 726 "PhotoMetadata.c"
 		HierarchicalKeywordField* object;
 		object = collect_values[0].v_pointer;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 735 "PhotoMetadata.c"
+#line 733 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 739 "PhotoMetadata.c"
+#line 737 "PhotoMetadata.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = hierarchical_keyword_field_ref (object);
-#line 743 "PhotoMetadata.c"
+#line 741 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 747 "PhotoMetadata.c"
+#line 745 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 751 "PhotoMetadata.c"
+#line 749 "PhotoMetadata.c"
 }
 
 
@@ -758,25 +756,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 762 "PhotoMetadata.c"
+#line 760 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 768 "PhotoMetadata.c"
+#line 766 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 772 "PhotoMetadata.c"
+#line 770 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 776 "PhotoMetadata.c"
+#line 774 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 780 "PhotoMetadata.c"
+#line 778 "PhotoMetadata.c"
 }
 
 
@@ -790,7 +788,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 794 "PhotoMetadata.c"
+#line 792 "PhotoMetadata.c"
 }
 
 
@@ -799,7 +797,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 803 "PhotoMetadata.c"
+#line 801 "PhotoMetadata.c"
 }
 
 
@@ -819,17 +817,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 823 "PhotoMetadata.c"
+#line 821 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 827 "PhotoMetadata.c"
+#line 825 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 833 "PhotoMetadata.c"
+#line 831 "PhotoMetadata.c"
 	}
 }
 
@@ -848,17 +846,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 852 "PhotoMetadata.c"
+#line 850 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 856 "PhotoMetadata.c"
+#line 854 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 862 "PhotoMetadata.c"
+#line 860 "PhotoMetadata.c"
 	}
 }
 
@@ -868,14 +866,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass
 	hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize;
-#line 872 "PhotoMetadata.c"
+#line 870 "PhotoMetadata.c"
 }
 
 
 static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 879 "PhotoMetadata.c"
+#line 877 "PhotoMetadata.c"
 }
 
 
@@ -889,7 +887,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj)
 	_g_free0 (self->field_name);
 #line 33 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->path_separator);
-#line 893 "PhotoMetadata.c"
+#line 891 "PhotoMetadata.c"
 }
 
 
@@ -914,7 +912,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 918 "PhotoMetadata.c"
+#line 916 "PhotoMetadata.c"
 }
 
 
@@ -927,7 +925,7 @@ void hierarchical_keyword_field_unref (gpointer instance) {
 		HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 931 "PhotoMetadata.c"
+#line 929 "PhotoMetadata.c"
 	}
 }
 
@@ -986,7 +984,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
 	self->priv->extension = _tmp7_;
 #line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 990 "PhotoMetadata.c"
+#line 988 "PhotoMetadata.c"
 }
 
 
@@ -1004,7 +1002,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
 	result = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1008 "PhotoMetadata.c"
+#line 1006 "PhotoMetadata.c"
 }
 
 
@@ -1018,7 +1016,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
 	*result = _tmp0_;
 #line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return;
-#line 1022 "PhotoMetadata.c"
+#line 1020 "PhotoMetadata.c"
 }
 
 
@@ -1033,7 +1031,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) {
 	result = _tmp0_;
 #line 70 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1037 "PhotoMetadata.c"
+#line 1035 "PhotoMetadata.c"
 }
 
 
@@ -1051,7 +1049,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
 	result = _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1055 "PhotoMetadata.c"
+#line 1053 "PhotoMetadata.c"
 }
 
 
@@ -1069,7 +1067,7 @@ gchar* photo_preview_get_extension (PhotoPreview* self) {
 	result = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1073 "PhotoMetadata.c"
+#line 1071 "PhotoMetadata.c"
 }
 
 
@@ -1078,7 +1076,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt
 	g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1082 "PhotoMetadata.c"
+#line 1080 "PhotoMetadata.c"
 }
 
 
@@ -1087,14 +1085,14 @@ guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError**
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error);
-#line 1091 "PhotoMetadata.c"
+#line 1089 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup4 (guint8* self, int length) {
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1098 "PhotoMetadata.c"
+#line 1096 "PhotoMetadata.c"
 }
 
 
@@ -1120,7 +1118,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		g_propagate_error (error, _inner_error_);
 #line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return NULL;
-#line 1124 "PhotoMetadata.c"
+#line 1122 "PhotoMetadata.c"
 	}
 	{
 		GdkPixbuf* _tmp2_ = NULL;
@@ -1140,7 +1138,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_;
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1149,7 +1147,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		_tmp2_ = _tmp7_;
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1153 "PhotoMetadata.c"
+#line 1151 "PhotoMetadata.c"
 			goto __catch23_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1164,7 +1162,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		flattened = (g_free (flattened), NULL);
 #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1168 "PhotoMetadata.c"
+#line 1166 "PhotoMetadata.c"
 	}
 	goto __finally23;
 	__catch23_g_error:
@@ -1193,7 +1191,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		flattened = (g_free (flattened), NULL);
 #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1197 "PhotoMetadata.c"
+#line 1195 "PhotoMetadata.c"
 	}
 	__finally23:
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1202,7 +1200,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 	flattened = (g_free (flattened), NULL);
 #line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1206 "PhotoMetadata.c"
+#line 1204 "PhotoMetadata.c"
 }
 
 
@@ -1211,14 +1209,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) {
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 83 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error);
-#line 1215 "PhotoMetadata.c"
+#line 1213 "PhotoMetadata.c"
 }
 
 
 static void value_photo_preview_init (GValue* value) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 1222 "PhotoMetadata.c"
+#line 1220 "PhotoMetadata.c"
 }
 
 
@@ -1227,7 +1225,7 @@ static void value_photo_preview_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (value->data[0].v_pointer);
-#line 1231 "PhotoMetadata.c"
+#line 1229 "PhotoMetadata.c"
 	}
 }
 
@@ -1237,11 +1235,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer);
-#line 1241 "PhotoMetadata.c"
+#line 1239 "PhotoMetadata.c"
 	} else {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1245 "PhotoMetadata.c"
+#line 1243 "PhotoMetadata.c"
 	}
 }
 
@@ -1249,37 +1247,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
 static gpointer value_photo_preview_peek_pointer (const GValue* value) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1253 "PhotoMetadata.c"
+#line 1251 "PhotoMetadata.c"
 }
 
 
 static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 1260 "PhotoMetadata.c"
+#line 1258 "PhotoMetadata.c"
 		PhotoPreview* object;
 		object = collect_values[0].v_pointer;
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1267 "PhotoMetadata.c"
+#line 1265 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 1271 "PhotoMetadata.c"
+#line 1269 "PhotoMetadata.c"
 		}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = photo_preview_ref (object);
-#line 1275 "PhotoMetadata.c"
+#line 1273 "PhotoMetadata.c"
 	} else {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1279 "PhotoMetadata.c"
+#line 1277 "PhotoMetadata.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1283 "PhotoMetadata.c"
+#line 1281 "PhotoMetadata.c"
 }
 
 
@@ -1290,25 +1288,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1294 "PhotoMetadata.c"
+#line 1292 "PhotoMetadata.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 1300 "PhotoMetadata.c"
+#line 1298 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1304 "PhotoMetadata.c"
+#line 1302 "PhotoMetadata.c"
 	} else {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = photo_preview_ref (value->data[0].v_pointer);
-#line 1308 "PhotoMetadata.c"
+#line 1306 "PhotoMetadata.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1312 "PhotoMetadata.c"
+#line 1310 "PhotoMetadata.c"
 }
 
 
@@ -1322,7 +1320,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 1326 "PhotoMetadata.c"
+#line 1324 "PhotoMetadata.c"
 }
 
 
@@ -1331,7 +1329,7 @@ gpointer value_get_photo_preview (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL);
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1335 "PhotoMetadata.c"
+#line 1333 "PhotoMetadata.c"
 }
 
 
@@ -1351,17 +1349,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_ref (value->data[0].v_pointer);
-#line 1355 "PhotoMetadata.c"
+#line 1353 "PhotoMetadata.c"
 	} else {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1359 "PhotoMetadata.c"
+#line 1357 "PhotoMetadata.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 1365 "PhotoMetadata.c"
+#line 1363 "PhotoMetadata.c"
 	}
 }
 
@@ -1380,17 +1378,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 1384 "PhotoMetadata.c"
+#line 1382 "PhotoMetadata.c"
 	} else {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1388 "PhotoMetadata.c"
+#line 1386 "PhotoMetadata.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 1394 "PhotoMetadata.c"
+#line 1392 "PhotoMetadata.c"
 	}
 }
 
@@ -1406,7 +1404,7 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
 	((PhotoPreviewClass *) klass)->flatten = photo_preview_real_flatten;
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->get_pixbuf = photo_preview_real_get_pixbuf;
-#line 1410 "PhotoMetadata.c"
+#line 1408 "PhotoMetadata.c"
 }
 
 
@@ -1415,7 +1413,7 @@ static void photo_preview_instance_init (PhotoPreview * self) {
 	self->priv = PHOTO_PREVIEW_GET_PRIVATE (self);
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 1419 "PhotoMetadata.c"
+#line 1417 "PhotoMetadata.c"
 }
 
 
@@ -1431,7 +1429,7 @@ static void photo_preview_finalize (PhotoPreview* obj) {
 	_g_free0 (self->priv->mime_type);
 #line 51 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->extension);
-#line 1435 "PhotoMetadata.c"
+#line 1433 "PhotoMetadata.c"
 }
 
 
@@ -1456,7 +1454,7 @@ gpointer photo_preview_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 1460 "PhotoMetadata.c"
+#line 1458 "PhotoMetadata.c"
 }
 
 
@@ -1469,7 +1467,7 @@ void photo_preview_unref (gpointer instance) {
 		PHOTO_PREVIEW_GET_CLASS (self)->finalize (self);
 #line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1473 "PhotoMetadata.c"
+#line 1471 "PhotoMetadata.c"
 	}
 }
 
@@ -1492,14 +1490,14 @@ PhotoMetadata* photo_metadata_construct (GType object_type) {
 	self = (PhotoMetadata*) media_metadata_construct (object_type);
 #line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1496 "PhotoMetadata.c"
+#line 1494 "PhotoMetadata.c"
 }
 
 
 PhotoMetadata* photo_metadata_new (void) {
 #line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_construct (TYPE_PHOTO_METADATA);
-#line 1503 "PhotoMetadata.c"
+#line 1501 "PhotoMetadata.c"
 }
 
 
@@ -1524,7 +1522,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 #line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = gexiv2_metadata_new ();
 #line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_gexiv2_metadata_free0 (self->priv->exiv2);
+	_g_object_unref0 (self->priv->exiv2);
 #line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1549,7 +1547,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 		g_propagate_error (error, _inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1553 "PhotoMetadata.c"
+#line 1551 "PhotoMetadata.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = file;
@@ -1573,7 +1571,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 	_g_free0 (self->priv->source_name);
 #line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp10_;
-#line 1577 "PhotoMetadata.c"
+#line 1575 "PhotoMetadata.c"
 }
 
 
@@ -1605,7 +1603,7 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
 		g_propagate_error (error, _inner_error_);
 #line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1609 "PhotoMetadata.c"
+#line 1607 "PhotoMetadata.c"
 	}
 }
 
@@ -1633,7 +1631,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 	_tmp0_ = length;
 #line 156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
-#line 1637 "PhotoMetadata.c"
+#line 1635 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 #line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1642,7 +1640,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 		_tmp1__length1 = buffer_length1;
 #line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		length = _tmp1__length1;
-#line 1646 "PhotoMetadata.c"
+#line 1644 "PhotoMetadata.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = buffer;
@@ -1655,7 +1653,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 #line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_new ();
 #line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_gexiv2_metadata_free0 (self->priv->exiv2);
+	_g_object_unref0 (self->priv->exiv2);
 #line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp4_;
 #line 162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1678,7 +1676,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 		g_propagate_error (error, _inner_error_);
 #line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1682 "PhotoMetadata.c"
+#line 1680 "PhotoMetadata.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = buffer;
@@ -1700,7 +1698,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 	_g_free0 (self->priv->source_name);
 #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp12_;
-#line 1704 "PhotoMetadata.c"
+#line 1702 "PhotoMetadata.c"
 }
 
 
@@ -1727,7 +1725,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 	_tmp0_ = length;
 #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
-#line 1731 "PhotoMetadata.c"
+#line 1729 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 #line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1736,7 +1734,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 		_tmp1__length1 = buffer_length1;
 #line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		length = _tmp1__length1;
-#line 1740 "PhotoMetadata.c"
+#line 1738 "PhotoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = buffer;
@@ -1749,7 +1747,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 #line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_new ();
 #line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_gexiv2_metadata_free0 (self->priv->exiv2);
+	_g_object_unref0 (self->priv->exiv2);
 #line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp4_;
 #line 176 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1772,7 +1770,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 		g_propagate_error (error, _inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1776 "PhotoMetadata.c"
+#line 1774 "PhotoMetadata.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = buffer;
@@ -1794,7 +1792,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 	_g_free0 (self->priv->source_name);
 #line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp12_;
-#line 1798 "PhotoMetadata.c"
+#line 1796 "PhotoMetadata.c"
 }
 
 
@@ -1818,7 +1816,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 		result = METADATA_DOMAIN_EXIF;
 #line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1822 "PhotoMetadata.c"
+#line 1820 "PhotoMetadata.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tag;
@@ -1830,7 +1828,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 		result = METADATA_DOMAIN_XMP;
 #line 188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1834 "PhotoMetadata.c"
+#line 1832 "PhotoMetadata.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = tag;
@@ -1842,13 +1840,13 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 		result = METADATA_DOMAIN_IPTC;
 #line 191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1846 "PhotoMetadata.c"
+#line 1844 "PhotoMetadata.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = METADATA_DOMAIN_UNKNOWN;
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1852 "PhotoMetadata.c"
+#line 1850 "PhotoMetadata.c"
 }
 
 
@@ -1863,7 +1861,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 	switch (_tmp0_) {
 #line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 1867 "PhotoMetadata.c"
+#line 1865 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -1875,11 +1873,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 			result = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1879 "PhotoMetadata.c"
+#line 1877 "PhotoMetadata.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 1883 "PhotoMetadata.c"
+#line 1881 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
@@ -1891,11 +1889,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 			result = _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1895 "PhotoMetadata.c"
+#line 1893 "PhotoMetadata.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 1899 "PhotoMetadata.c"
+#line 1897 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
@@ -1907,18 +1905,18 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 			result = _tmp6_;
 #line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1911 "PhotoMetadata.c"
+#line 1909 "PhotoMetadata.c"
 		}
 		default:
 #line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 1916 "PhotoMetadata.c"
+#line 1914 "PhotoMetadata.c"
 		{
 #line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
 #line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1922 "PhotoMetadata.c"
+#line 1920 "PhotoMetadata.c"
 		}
 	}
 }
@@ -1935,7 +1933,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1939 "PhotoMetadata.c"
+#line 1937 "PhotoMetadata.c"
 }
 
 
@@ -1950,7 +1948,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1954 "PhotoMetadata.c"
+#line 1952 "PhotoMetadata.c"
 }
 
 
@@ -1965,7 +1963,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1969 "PhotoMetadata.c"
+#line 1967 "PhotoMetadata.c"
 }
 
 
@@ -1980,7 +1978,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 	switch (_tmp0_) {
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 1984 "PhotoMetadata.c"
+#line 1982 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -1992,11 +1990,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 			result = _tmp2_;
 #line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1996 "PhotoMetadata.c"
+#line 1994 "PhotoMetadata.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 2000 "PhotoMetadata.c"
+#line 1998 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
@@ -2008,11 +2006,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 			result = _tmp4_;
 #line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2012 "PhotoMetadata.c"
+#line 2010 "PhotoMetadata.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2016 "PhotoMetadata.c"
+#line 2014 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
@@ -2024,18 +2022,18 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 			result = _tmp6_;
 #line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2028 "PhotoMetadata.c"
+#line 2026 "PhotoMetadata.c"
 		}
 		default:
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 2033 "PhotoMetadata.c"
+#line 2031 "PhotoMetadata.c"
 		{
 #line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2039 "PhotoMetadata.c"
+#line 2037 "PhotoMetadata.c"
 		}
 	}
 }
@@ -2052,7 +2050,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2056 "PhotoMetadata.c"
+#line 2054 "PhotoMetadata.c"
 }
 
 
@@ -2067,7 +2065,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2071 "PhotoMetadata.c"
+#line 2069 "PhotoMetadata.c"
 }
 
 
@@ -2082,7 +2080,7 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2086 "PhotoMetadata.c"
+#line 2084 "PhotoMetadata.c"
 }
 
 
@@ -2105,7 +2103,7 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
 	result = _tmp2_;
 #line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2109 "PhotoMetadata.c"
+#line 2107 "PhotoMetadata.c"
 }
 
 
@@ -2121,7 +2119,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 	_tmp0__target = compare_func_target;
 #line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 2125 "PhotoMetadata.c"
+#line 2123 "PhotoMetadata.c"
 		GeeHashSet* _tmp1_ = NULL;
 #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -2137,7 +2135,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 		compare_func_target_destroy_notify = NULL;
 #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2141 "PhotoMetadata.c"
+#line 2139 "PhotoMetadata.c"
 	} else {
 		GCompareDataFunc _tmp2_ = NULL;
 		void* _tmp2__target = NULL;
@@ -2165,7 +2163,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 		compare_func_target_destroy_notify = NULL;
 #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2169 "PhotoMetadata.c"
+#line 2167 "PhotoMetadata.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
@@ -2175,7 +2173,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 	compare_func_target = NULL;
 #line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 2179 "PhotoMetadata.c"
+#line 2177 "PhotoMetadata.c"
 }
 
 
@@ -2209,7 +2207,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	switch (_tmp0_) {
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 2213 "PhotoMetadata.c"
+#line 2211 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gchar** _tmp2_ = NULL;
@@ -2228,11 +2226,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2232 "PhotoMetadata.c"
+#line 2230 "PhotoMetadata.c"
 		}
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 2236 "PhotoMetadata.c"
+#line 2234 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp4_ = NULL;
 			gchar** _tmp5_ = NULL;
@@ -2251,11 +2249,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2255 "PhotoMetadata.c"
+#line 2253 "PhotoMetadata.c"
 		}
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2259 "PhotoMetadata.c"
+#line 2257 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp7_ = NULL;
 			gchar** _tmp8_ = NULL;
@@ -2274,12 +2272,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2278 "PhotoMetadata.c"
+#line 2276 "PhotoMetadata.c"
 		}
 		default:
 #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 2283 "PhotoMetadata.c"
+#line 2281 "PhotoMetadata.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = tags;
@@ -2289,7 +2287,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	if (_tmp11_ == NULL) {
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = TRUE;
-#line 2293 "PhotoMetadata.c"
+#line 2291 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp12_ = NULL;
 		gint _tmp12__length1 = 0;
@@ -2299,7 +2297,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		_tmp12__length1 = tags_length1;
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12__length1 == 0;
-#line 2303 "PhotoMetadata.c"
+#line 2301 "PhotoMetadata.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
@@ -2317,7 +2315,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		compare_func_target_destroy_notify = NULL;
 #line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2321 "PhotoMetadata.c"
+#line 2319 "PhotoMetadata.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = compare_func;
@@ -2335,7 +2333,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	_tmp15_ = tags;
 #line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = tags_length1;
-#line 2339 "PhotoMetadata.c"
+#line 2337 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -2347,14 +2345,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		tag_collection_length1 = _tmp15__length1;
 #line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 2351 "PhotoMetadata.c"
+#line 2349 "PhotoMetadata.c"
 			gchar* _tmp16_ = NULL;
 			gchar* tag = NULL;
 #line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp16_ = g_strdup (tag_collection[tag_it]);
 #line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp16_;
-#line 2358 "PhotoMetadata.c"
+#line 2356 "PhotoMetadata.c"
 			{
 				GeeCollection* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
@@ -2366,7 +2364,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 				gee_collection_add (_tmp17_, _tmp18_);
 #line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2370 "PhotoMetadata.c"
+#line 2368 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -2384,14 +2382,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	compare_func_target_destroy_notify = NULL;
 #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2388 "PhotoMetadata.c"
+#line 2386 "PhotoMetadata.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2395 "PhotoMetadata.c"
+#line 2393 "PhotoMetadata.c"
 }
 
 
@@ -2441,7 +2439,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp4_ = exif_tags;
 #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 2445 "PhotoMetadata.c"
+#line 2443 "PhotoMetadata.c"
 		GeeCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -2453,15 +2451,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp7_ = _tmp6_;
 #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp7_ > 0;
-#line 2457 "PhotoMetadata.c"
+#line 2455 "PhotoMetadata.c"
 	} else {
 #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = FALSE;
-#line 2461 "PhotoMetadata.c"
+#line 2459 "PhotoMetadata.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 2465 "PhotoMetadata.c"
+#line 2463 "PhotoMetadata.c"
 		GeeCollection* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
 #line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2470,7 +2468,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp9_ = exif_tags;
 #line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp8_, _tmp9_);
-#line 2474 "PhotoMetadata.c"
+#line 2472 "PhotoMetadata.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
@@ -2480,7 +2478,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp12_ = xmp_tags;
 #line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp12_ != NULL) {
-#line 2484 "PhotoMetadata.c"
+#line 2482 "PhotoMetadata.c"
 		GeeCollection* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -2492,15 +2490,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp15_ = _tmp14_;
 #line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp15_ > 0;
-#line 2496 "PhotoMetadata.c"
+#line 2494 "PhotoMetadata.c"
 	} else {
 #line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = FALSE;
-#line 2500 "PhotoMetadata.c"
+#line 2498 "PhotoMetadata.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_) {
-#line 2504 "PhotoMetadata.c"
+#line 2502 "PhotoMetadata.c"
 		GeeCollection* _tmp16_ = NULL;
 		GeeCollection* _tmp17_ = NULL;
 #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2509,7 +2507,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp17_ = xmp_tags;
 #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp16_, _tmp17_);
-#line 2513 "PhotoMetadata.c"
+#line 2511 "PhotoMetadata.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
@@ -2519,7 +2517,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp20_ = iptc_tags;
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_ != NULL) {
-#line 2523 "PhotoMetadata.c"
+#line 2521 "PhotoMetadata.c"
 		GeeCollection* _tmp21_ = NULL;
 		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
@@ -2531,15 +2529,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp23_ = _tmp22_;
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp23_ > 0;
-#line 2535 "PhotoMetadata.c"
+#line 2533 "PhotoMetadata.c"
 	} else {
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 2539 "PhotoMetadata.c"
+#line 2537 "PhotoMetadata.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 2543 "PhotoMetadata.c"
+#line 2541 "PhotoMetadata.c"
 		GeeCollection* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2548,7 +2546,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp25_ = iptc_tags;
 #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp24_, _tmp25_);
-#line 2552 "PhotoMetadata.c"
+#line 2550 "PhotoMetadata.c"
 	}
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = all_tags;
@@ -2558,17 +2556,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp29_ = _tmp28_;
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp29_ > 0) {
-#line 2562 "PhotoMetadata.c"
+#line 2560 "PhotoMetadata.c"
 		GeeCollection* _tmp30_ = NULL;
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = all_tags;
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = _tmp30_;
-#line 2568 "PhotoMetadata.c"
+#line 2566 "PhotoMetadata.c"
 	} else {
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = NULL;
-#line 2572 "PhotoMetadata.c"
+#line 2570 "PhotoMetadata.c"
 	}
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp31_ = _g_object_ref0 (_tmp26_);
@@ -2592,7 +2590,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	compare_func_target_destroy_notify = NULL;
 #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2596 "PhotoMetadata.c"
+#line 2594 "PhotoMetadata.c"
 }
 
 
@@ -2615,7 +2613,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 	result = _tmp2_;
 #line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2619 "PhotoMetadata.c"
+#line 2617 "PhotoMetadata.c"
 }
 
 
@@ -2638,7 +2636,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
 	result = _tmp2_;
 #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2642 "PhotoMetadata.c"
+#line 2640 "PhotoMetadata.c"
 }
 
 
@@ -2675,7 +2673,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
 	result = _tmp6_;
 #line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2679 "PhotoMetadata.c"
+#line 2677 "PhotoMetadata.c"
 }
 
 
@@ -2712,7 +2710,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
 	result = _tmp6_;
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2716 "PhotoMetadata.c"
+#line 2714 "PhotoMetadata.c"
 }
 
 
@@ -2726,7 +2724,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	_tmp0_ = tags;
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 2730 "PhotoMetadata.c"
+#line 2728 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -2738,14 +2736,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 		tag_collection_length1 = _tmp0__length1;
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2742 "PhotoMetadata.c"
+#line 2740 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 2749 "PhotoMetadata.c"
+#line 2747 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -2767,13 +2765,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 					_g_free0 (tag);
 #line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 2771 "PhotoMetadata.c"
+#line 2769 "PhotoMetadata.c"
 				}
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
 #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2777 "PhotoMetadata.c"
+#line 2775 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -2781,7 +2779,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	result = NULL;
 #line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2785 "PhotoMetadata.c"
+#line 2783 "PhotoMetadata.c"
 }
 
 
@@ -2795,7 +2793,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	_tmp0_ = tags;
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 2799 "PhotoMetadata.c"
+#line 2797 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -2807,14 +2805,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 		tag_collection_length1 = _tmp0__length1;
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2811 "PhotoMetadata.c"
+#line 2809 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 2818 "PhotoMetadata.c"
+#line 2816 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -2836,13 +2834,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 					_g_free0 (tag);
 #line 342 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 2840 "PhotoMetadata.c"
+#line 2838 "PhotoMetadata.c"
 				}
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
 #line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2846 "PhotoMetadata.c"
+#line 2844 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -2850,7 +2848,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	result = NULL;
 #line 345 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2854 "PhotoMetadata.c"
+#line 2852 "PhotoMetadata.c"
 }
 
 
@@ -2901,7 +2899,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	if (_tmp5_ == NULL) {
 #line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = TRUE;
-#line 2905 "PhotoMetadata.c"
+#line 2903 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
@@ -2911,7 +2909,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		_tmp6__length1 = values_length1;
 #line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 2915 "PhotoMetadata.c"
+#line 2913 "PhotoMetadata.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
@@ -2921,7 +2919,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2925 "PhotoMetadata.c"
+#line 2923 "PhotoMetadata.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
@@ -2935,7 +2933,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	_tmp9_ = values;
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = values_length1;
-#line 2939 "PhotoMetadata.c"
+#line 2937 "PhotoMetadata.c"
 	{
 		gchar** value_collection = NULL;
 		gint value_collection_length1 = 0;
@@ -2947,14 +2945,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		value_collection_length1 = _tmp9__length1;
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 2951 "PhotoMetadata.c"
+#line 2949 "PhotoMetadata.c"
 			gchar* _tmp10_ = NULL;
 			gchar* value = NULL;
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = g_strdup (value_collection[value_it]);
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = _tmp10_;
-#line 2958 "PhotoMetadata.c"
+#line 2956 "PhotoMetadata.c"
 			{
 				gchar* prepped = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -2971,7 +2969,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 				_tmp14_ = prepped;
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp14_ != NULL) {
-#line 2975 "PhotoMetadata.c"
+#line 2973 "PhotoMetadata.c"
 					GeeHashSet* _tmp15_ = NULL;
 					const gchar* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
@@ -2983,15 +2981,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 					_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = !_tmp17_;
-#line 2987 "PhotoMetadata.c"
+#line 2985 "PhotoMetadata.c"
 				} else {
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = FALSE;
-#line 2991 "PhotoMetadata.c"
+#line 2989 "PhotoMetadata.c"
 				}
 #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_) {
-#line 2995 "PhotoMetadata.c"
+#line 2993 "PhotoMetadata.c"
 					GeeList* _tmp18_ = NULL;
 					const gchar* _tmp19_ = NULL;
 					GeeHashSet* _tmp20_ = NULL;
@@ -3008,13 +3006,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 					_tmp21_ = prepped;
 #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3012 "PhotoMetadata.c"
+#line 3010 "PhotoMetadata.c"
 				}
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (prepped);
 #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 3018 "PhotoMetadata.c"
+#line 3016 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3026,17 +3024,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	_tmp25_ = _tmp24_;
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp25_ > 0) {
-#line 3030 "PhotoMetadata.c"
+#line 3028 "PhotoMetadata.c"
 		GeeList* _tmp26_ = NULL;
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = list;
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp26_;
-#line 3036 "PhotoMetadata.c"
+#line 3034 "PhotoMetadata.c"
 	} else {
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 3040 "PhotoMetadata.c"
+#line 3038 "PhotoMetadata.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = _g_object_ref0 (_tmp22_);
@@ -3050,7 +3048,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3054 "PhotoMetadata.c"
+#line 3052 "PhotoMetadata.c"
 }
 
 
@@ -3064,7 +3062,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	_tmp0_ = tags;
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3068 "PhotoMetadata.c"
+#line 3066 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3076,14 +3074,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 		tag_collection_length1 = _tmp0__length1;
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3080 "PhotoMetadata.c"
+#line 3078 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3087 "PhotoMetadata.c"
+#line 3085 "PhotoMetadata.c"
 			{
 				GeeList* values = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -3100,7 +3098,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 				_tmp5_ = values;
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 3104 "PhotoMetadata.c"
+#line 3102 "PhotoMetadata.c"
 					GeeList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
@@ -3112,11 +3110,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 					_tmp8_ = _tmp7_;
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 3116 "PhotoMetadata.c"
+#line 3114 "PhotoMetadata.c"
 				} else {
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 3120 "PhotoMetadata.c"
+#line 3118 "PhotoMetadata.c"
 				}
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
@@ -3126,13 +3124,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 					_g_free0 (tag);
 #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3130 "PhotoMetadata.c"
+#line 3128 "PhotoMetadata.c"
 				}
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3136 "PhotoMetadata.c"
+#line 3134 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3140,7 +3138,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	result = NULL;
 #line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3144 "PhotoMetadata.c"
+#line 3142 "PhotoMetadata.c"
 }
 
 
@@ -3172,7 +3170,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	_tmp3_ = prepped;
 #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_ == NULL) {
-#line 3176 "PhotoMetadata.c"
+#line 3174 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3185,7 +3183,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 		_g_free0 (prepped);
 #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 3189 "PhotoMetadata.c"
+#line 3187 "PhotoMetadata.c"
 	}
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = self->priv->exiv2;
@@ -3197,7 +3195,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp9_) {
-#line 3201 "PhotoMetadata.c"
+#line 3199 "PhotoMetadata.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -3210,11 +3208,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:400: Unable to set tag %s to string %s from source " \
 "%s", _tmp10_, _tmp11_, _tmp12_);
-#line 3213 "PhotoMetadata.c"
+#line 3211 "PhotoMetadata.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (prepped);
-#line 3217 "PhotoMetadata.c"
+#line 3215 "PhotoMetadata.c"
 }
 
 
@@ -3233,7 +3231,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	_tmp0_ = tags;
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3236 "PhotoMetadata.c"
+#line 3234 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3245,14 +3243,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		tag_collection_length1 = _tmp0__length1;
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3248 "PhotoMetadata.c"
+#line 3246 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3255 "PhotoMetadata.c"
+#line 3253 "PhotoMetadata.c"
 			{
 				gboolean _tmp2_ = FALSE;
 				PhotoMetadataSetOption _tmp3_ = 0;
@@ -3262,7 +3260,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 				if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
 #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = TRUE;
-#line 3265 "PhotoMetadata.c"
+#line 3263 "PhotoMetadata.c"
 				} else {
 					const gchar* _tmp4_ = NULL;
 					MetadataDomain _tmp5_ = 0;
@@ -3275,11 +3273,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
 #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = _tmp6_;
-#line 3278 "PhotoMetadata.c"
+#line 3276 "PhotoMetadata.c"
 				}
 #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp2_) {
-#line 3282 "PhotoMetadata.c"
+#line 3280 "PhotoMetadata.c"
 					PhotoMetadataSetGenericValue _tmp7_ = NULL;
 					void* _tmp7__target = NULL;
 					const gchar* _tmp8_ = NULL;
@@ -3293,11 +3291,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp7_ (_tmp8_, _tmp7__target);
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					written = TRUE;
-#line 3296 "PhotoMetadata.c"
+#line 3294 "PhotoMetadata.c"
 				}
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3300 "PhotoMetadata.c"
+#line 3298 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3305,21 +3303,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	_tmp11_ = option;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 3308 "PhotoMetadata.c"
+#line 3306 "PhotoMetadata.c"
 		gboolean _tmp12_ = FALSE;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = written;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = !_tmp12_;
-#line 3314 "PhotoMetadata.c"
+#line 3312 "PhotoMetadata.c"
 	} else {
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 3318 "PhotoMetadata.c"
+#line 3316 "PhotoMetadata.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 3322 "PhotoMetadata.c"
+#line 3320 "PhotoMetadata.c"
 		gchar** _tmp13_ = NULL;
 		gint _tmp13__length1 = 0;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3328,15 +3326,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		_tmp13__length1 = tags_length1;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp13__length1 > 0;
-#line 3331 "PhotoMetadata.c"
+#line 3329 "PhotoMetadata.c"
 	} else {
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = FALSE;
-#line 3335 "PhotoMetadata.c"
+#line 3333 "PhotoMetadata.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp9_) {
-#line 3339 "PhotoMetadata.c"
+#line 3337 "PhotoMetadata.c"
 		MetadataDomain default_domain = 0;
 		gchar** _tmp14_ = NULL;
 		gint _tmp14__length1 = 0;
@@ -3369,19 +3367,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		_tmp19_ = _tmp18_[0];
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ (_tmp19_, _tmp17__target);
-#line 3372 "PhotoMetadata.c"
+#line 3370 "PhotoMetadata.c"
 		{
 			gint ctr = 0;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			ctr = 1;
-#line 3377 "PhotoMetadata.c"
+#line 3375 "PhotoMetadata.c"
 			{
 				gboolean _tmp20_ = FALSE;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp20_ = TRUE;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				while (TRUE) {
-#line 3384 "PhotoMetadata.c"
+#line 3382 "PhotoMetadata.c"
 					gint _tmp22_ = 0;
 					gchar** _tmp23_ = NULL;
 					gint _tmp23__length1 = 0;
@@ -3393,13 +3391,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					MetadataDomain _tmp28_ = 0;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!_tmp20_) {
-#line 3396 "PhotoMetadata.c"
+#line 3394 "PhotoMetadata.c"
 						gint _tmp21_ = 0;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = ctr;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						ctr = _tmp21_ + 1;
-#line 3402 "PhotoMetadata.c"
+#line 3400 "PhotoMetadata.c"
 					}
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = FALSE;
@@ -3413,7 +3411,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					if (!(_tmp22_ < _tmp23__length1)) {
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						break;
-#line 3416 "PhotoMetadata.c"
+#line 3414 "PhotoMetadata.c"
 					}
 #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24_ = tags;
@@ -3429,7 +3427,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp28_ = default_domain;
 #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp27_ == _tmp28_) {
-#line 3432 "PhotoMetadata.c"
+#line 3430 "PhotoMetadata.c"
 						PhotoMetadataSetGenericValue _tmp29_ = NULL;
 						void* _tmp29__target = NULL;
 						gchar** _tmp30_ = NULL;
@@ -3450,7 +3448,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 						_tmp32_ = _tmp30_[_tmp31_];
 #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ (_tmp32_, _tmp29__target);
-#line 3453 "PhotoMetadata.c"
+#line 3451 "PhotoMetadata.c"
 					}
 				}
 			}
@@ -3464,7 +3462,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 	g_atomic_int_inc (&_data1_->_ref_count_);
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data1_;
-#line 3467 "PhotoMetadata.c"
+#line 3465 "PhotoMetadata.c"
 }
 
 
@@ -3473,7 +3471,7 @@ static void block1_data_unref (void * _userdata_) {
 	_data1_ = (Block1Data*) _userdata_;
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 3476 "PhotoMetadata.c"
+#line 3474 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data1_->self;
@@ -3483,7 +3481,7 @@ static void block1_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 3486 "PhotoMetadata.c"
+#line 3484 "PhotoMetadata.c"
 	}
 }
 
@@ -3502,14 +3500,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
 	_tmp1_ = _data1_->value;
 #line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 3505 "PhotoMetadata.c"
+#line 3503 "PhotoMetadata.c"
 }
 
 
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda5_ (self, tag);
-#line 3512 "PhotoMetadata.c"
+#line 3510 "PhotoMetadata.c"
 }
 
 
@@ -3550,7 +3548,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
 	block1_data_unref (_data1_);
 #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = NULL;
-#line 3553 "PhotoMetadata.c"
+#line 3551 "PhotoMetadata.c"
 }
 
 
@@ -3561,13 +3559,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3564 "PhotoMetadata.c"
+#line 3562 "PhotoMetadata.c"
 	}
 #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
 #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 3570 "PhotoMetadata.c"
+#line 3568 "PhotoMetadata.c"
 }
 
 
@@ -3578,13 +3576,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3581 "PhotoMetadata.c"
+#line 3579 "PhotoMetadata.c"
 	}
 #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
 #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 3587 "PhotoMetadata.c"
+#line 3585 "PhotoMetadata.c"
 }
 
 
@@ -3616,7 +3614,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	values_length1 = 0;
 #line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 3619 "PhotoMetadata.c"
+#line 3617 "PhotoMetadata.c"
 	{
 		GeeIterator* _value_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -3629,7 +3627,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 		_value_it = _tmp2_;
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		while (TRUE) {
-#line 3632 "PhotoMetadata.c"
+#line 3630 "PhotoMetadata.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			gchar* value = NULL;
@@ -3647,7 +3645,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			if (!_tmp4_) {
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				break;
-#line 3650 "PhotoMetadata.c"
+#line 3648 "PhotoMetadata.c"
 			}
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _value_it;
@@ -3665,7 +3663,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			_tmp9_ = prepped;
 #line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (_tmp9_ != NULL) {
-#line 3668 "PhotoMetadata.c"
+#line 3666 "PhotoMetadata.c"
 				gchar** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				const gchar* _tmp11_ = NULL;
@@ -3680,7 +3678,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 				_tmp12_ = g_strdup (_tmp11_);
 #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 3683 "PhotoMetadata.c"
+#line 3681 "PhotoMetadata.c"
 			} else {
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -3690,17 +3688,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 				_tmp14_ = tag;
 #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				g_warning ("PhotoMetadata.vala:439: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 3693 "PhotoMetadata.c"
+#line 3691 "PhotoMetadata.c"
 			}
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (prepped);
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (value);
-#line 3699 "PhotoMetadata.c"
+#line 3697 "PhotoMetadata.c"
 		}
 #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_value_it);
-#line 3703 "PhotoMetadata.c"
+#line 3701 "PhotoMetadata.c"
 	}
 #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = values;
@@ -3712,7 +3710,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 3715 "PhotoMetadata.c"
+#line 3713 "PhotoMetadata.c"
 	}
 #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = values;
@@ -3732,7 +3730,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp20_) {
-#line 3735 "PhotoMetadata.c"
+#line 3733 "PhotoMetadata.c"
 		gchar** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 		const gchar* _tmp22_ = NULL;
@@ -3748,11 +3746,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:452: Unable to set %d strings to tag %s from source" \
 " %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 3750 "PhotoMetadata.c"
+#line 3748 "PhotoMetadata.c"
 	}
 #line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 3754 "PhotoMetadata.c"
+#line 3752 "PhotoMetadata.c"
 }
 
 
@@ -3761,7 +3759,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
 	g_atomic_int_inc (&_data2_->_ref_count_);
 #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data2_;
-#line 3763 "PhotoMetadata.c"
+#line 3761 "PhotoMetadata.c"
 }
 
 
@@ -3770,7 +3768,7 @@ static void block2_data_unref (void * _userdata_) {
 	_data2_ = (Block2Data*) _userdata_;
 #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 3772 "PhotoMetadata.c"
+#line 3770 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data2_->self;
@@ -3780,7 +3778,7 @@ static void block2_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 3782 "PhotoMetadata.c"
+#line 3780 "PhotoMetadata.c"
 	}
 }
 
@@ -3799,14 +3797,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
 	_tmp1_ = _data2_->values;
 #line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 3801 "PhotoMetadata.c"
+#line 3799 "PhotoMetadata.c"
 }
 
 
 static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda6_ (self, tag);
-#line 3808 "PhotoMetadata.c"
+#line 3806 "PhotoMetadata.c"
 }
 
 
@@ -3847,7 +3845,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
 	block2_data_unref (_data2_);
 #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = NULL;
-#line 3849 "PhotoMetadata.c"
+#line 3847 "PhotoMetadata.c"
 }
 
 
@@ -3877,11 +3875,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 		if (value) {
 #line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*value = _vala_value;
-#line 3879 "PhotoMetadata.c"
+#line 3877 "PhotoMetadata.c"
 		}
 #line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3883 "PhotoMetadata.c"
+#line 3881 "PhotoMetadata.c"
 	}
 #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exiv2;
@@ -3897,11 +3895,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 	if (value) {
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 3899 "PhotoMetadata.c"
+#line 3897 "PhotoMetadata.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3903 "PhotoMetadata.c"
+#line 3901 "PhotoMetadata.c"
 }
 
 
@@ -3916,7 +3914,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	_tmp0_ = tags;
 #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3918 "PhotoMetadata.c"
+#line 3916 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3928,14 +3926,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 		tag_collection_length1 = _tmp0__length1;
 #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3930 "PhotoMetadata.c"
+#line 3928 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3937 "PhotoMetadata.c"
+#line 3935 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				glong _tmp3_ = 0L;
@@ -3956,15 +3954,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 					if (value) {
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*value = _vala_value;
-#line 3958 "PhotoMetadata.c"
+#line 3956 "PhotoMetadata.c"
 					}
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3962 "PhotoMetadata.c"
+#line 3960 "PhotoMetadata.c"
 				}
 #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3966 "PhotoMetadata.c"
+#line 3964 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3976,11 +3974,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	if (value) {
 #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 3978 "PhotoMetadata.c"
+#line 3976 "PhotoMetadata.c"
 	}
 #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3982 "PhotoMetadata.c"
+#line 3980 "PhotoMetadata.c"
 }
 
 
@@ -4003,7 +4001,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 	_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
 #line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
-#line 4005 "PhotoMetadata.c"
+#line 4003 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		glong _tmp5_ = 0L;
 		const gchar* _tmp6_ = NULL;
@@ -4016,7 +4014,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:484: Unable to set tag %s to long %ld from source %" \
 "s", _tmp4_, _tmp5_, _tmp6_);
-#line 4017 "PhotoMetadata.c"
+#line 4015 "PhotoMetadata.c"
 	}
 }
 
@@ -4026,7 +4024,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
 	g_atomic_int_inc (&_data3_->_ref_count_);
 #line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data3_;
-#line 4027 "PhotoMetadata.c"
+#line 4025 "PhotoMetadata.c"
 }
 
 
@@ -4035,7 +4033,7 @@ static void block3_data_unref (void * _userdata_) {
 	_data3_ = (Block3Data*) _userdata_;
 #line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4036 "PhotoMetadata.c"
+#line 4034 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data3_->self;
@@ -4043,7 +4041,7 @@ static void block3_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 4044 "PhotoMetadata.c"
+#line 4042 "PhotoMetadata.c"
 	}
 }
 
@@ -4062,14 +4060,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
 	_tmp1_ = _data3_->value;
 #line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4063 "PhotoMetadata.c"
+#line 4061 "PhotoMetadata.c"
 }
 
 
 static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda7_ (self, tag);
-#line 4070 "PhotoMetadata.c"
+#line 4068 "PhotoMetadata.c"
 }
 
 
@@ -4103,7 +4101,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
 	block3_data_unref (_data3_);
 #line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = NULL;
-#line 4104 "PhotoMetadata.c"
+#line 4102 "PhotoMetadata.c"
 }
 
 
@@ -4142,11 +4140,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 	if (rational) {
 #line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 4143 "PhotoMetadata.c"
+#line 4141 "PhotoMetadata.c"
 	}
 #line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4147 "PhotoMetadata.c"
+#line 4145 "PhotoMetadata.c"
 }
 
 
@@ -4161,7 +4159,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	_tmp0_ = tags;
 #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4162 "PhotoMetadata.c"
+#line 4160 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -4173,14 +4171,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 		tag_collection_length1 = _tmp0__length1;
 #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4174 "PhotoMetadata.c"
+#line 4172 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4181 "PhotoMetadata.c"
+#line 4179 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				MetadataRational _tmp3_ = {0};
@@ -4201,15 +4199,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 					if (rational) {
 #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*rational = _vala_rational;
-#line 4202 "PhotoMetadata.c"
+#line 4200 "PhotoMetadata.c"
 					}
 #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4206 "PhotoMetadata.c"
+#line 4204 "PhotoMetadata.c"
 				}
 #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4210 "PhotoMetadata.c"
+#line 4208 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4221,11 +4219,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	if (rational) {
 #line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 4222 "PhotoMetadata.c"
+#line 4220 "PhotoMetadata.c"
 	}
 #line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4226 "PhotoMetadata.c"
+#line 4224 "PhotoMetadata.c"
 }
 
 
@@ -4259,7 +4257,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 	_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
 #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 4260 "PhotoMetadata.c"
+#line 4258 "PhotoMetadata.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -4277,7 +4275,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 "e %s", _tmp7_, _tmp9_, _tmp10_);
 #line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp9_);
-#line 4277 "PhotoMetadata.c"
+#line 4275 "PhotoMetadata.c"
 	}
 }
 
@@ -4287,7 +4285,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) {
 	g_atomic_int_inc (&_data4_->_ref_count_);
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data4_;
-#line 4287 "PhotoMetadata.c"
+#line 4285 "PhotoMetadata.c"
 }
 
 
@@ -4296,7 +4294,7 @@ static void block4_data_unref (void * _userdata_) {
 	_data4_ = (Block4Data*) _userdata_;
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 4296 "PhotoMetadata.c"
+#line 4294 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data4_->self;
@@ -4304,7 +4302,7 @@ static void block4_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block4Data, _data4_);
-#line 4304 "PhotoMetadata.c"
+#line 4302 "PhotoMetadata.c"
 	}
 }
 
@@ -4323,14 +4321,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
 	_tmp1_ = _data4_->rational;
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 4323 "PhotoMetadata.c"
+#line 4321 "PhotoMetadata.c"
 }
 
 
 static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda8_ (self, tag);
-#line 4330 "PhotoMetadata.c"
+#line 4328 "PhotoMetadata.c"
 }
 
 
@@ -4366,7 +4364,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
 	block4_data_unref (_data4_);
 #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = NULL;
-#line 4366 "PhotoMetadata.c"
+#line 4364 "PhotoMetadata.c"
 }
 
 
@@ -4397,7 +4395,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		_g_free0 (value);
 #line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4397 "PhotoMetadata.c"
+#line 4395 "PhotoMetadata.c"
 	}
 	{
 		const gchar* _tmp3_ = NULL;
@@ -4410,7 +4408,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		switch (_tmp4_) {
 #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_XMP:
-#line 4410 "PhotoMetadata.c"
+#line 4408 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -4424,7 +4422,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_tmp5_ = _tmp7_;
 #line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4424 "PhotoMetadata.c"
+#line 4422 "PhotoMetadata.c"
 					goto __catch24_g_error;
 				}
 #line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4439,11 +4437,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4439 "PhotoMetadata.c"
+#line 4437 "PhotoMetadata.c"
 			}
 #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_IPTC:
-#line 4443 "PhotoMetadata.c"
+#line 4441 "PhotoMetadata.c"
 			{
 #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = NULL;
@@ -4451,12 +4449,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4451 "PhotoMetadata.c"
+#line 4449 "PhotoMetadata.c"
 			}
 			default:
 #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_EXIF:
-#line 4456 "PhotoMetadata.c"
+#line 4454 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp9_ = NULL;
 				const gchar* _tmp10_ = NULL;
@@ -4470,7 +4468,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_tmp9_ = _tmp11_;
 #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4470 "PhotoMetadata.c"
+#line 4468 "PhotoMetadata.c"
 					goto __catch24_g_error;
 				}
 #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4485,7 +4483,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4485 "PhotoMetadata.c"
+#line 4483 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4519,7 +4517,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		_g_free0 (value);
 #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4519 "PhotoMetadata.c"
+#line 4517 "PhotoMetadata.c"
 	}
 	__finally24:
 #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4530,7 +4528,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 	g_clear_error (&_inner_error_);
 #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 4530 "PhotoMetadata.c"
+#line 4528 "PhotoMetadata.c"
 }
 
 
@@ -4544,7 +4542,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	_tmp0_ = tags;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4544 "PhotoMetadata.c"
+#line 4542 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -4556,14 +4554,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 		tag_collection_length1 = _tmp0__length1;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4556 "PhotoMetadata.c"
+#line 4554 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4563 "PhotoMetadata.c"
+#line 4561 "PhotoMetadata.c"
 			{
 				MetadataDateTime* date_time = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -4585,13 +4583,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 					_g_free0 (tag);
 #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4585 "PhotoMetadata.c"
+#line 4583 "PhotoMetadata.c"
 				}
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (date_time);
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4591 "PhotoMetadata.c"
+#line 4589 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4599,7 +4597,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	result = NULL;
 #line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4599 "PhotoMetadata.c"
+#line 4597 "PhotoMetadata.c"
 }
 
 
@@ -4620,7 +4618,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 	switch (_tmp1_) {
 #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 4620 "PhotoMetadata.c"
+#line 4618 "PhotoMetadata.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			MetadataDateTime* _tmp3_ = NULL;
@@ -4640,11 +4638,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 			_g_free0 (_tmp5_);
 #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4640 "PhotoMetadata.c"
+#line 4638 "PhotoMetadata.c"
 		}
 #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 4644 "PhotoMetadata.c"
+#line 4642 "PhotoMetadata.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			MetadataDateTime* _tmp7_ = NULL;
@@ -4664,12 +4662,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 			_g_free0 (_tmp9_);
 #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4664 "PhotoMetadata.c"
+#line 4662 "PhotoMetadata.c"
 		}
 		default:
 #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 4669 "PhotoMetadata.c"
+#line 4667 "PhotoMetadata.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -4691,7 +4689,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
 #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4690 "PhotoMetadata.c"
+#line 4688 "PhotoMetadata.c"
 		}
 	}
 }
@@ -4700,7 +4698,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 static gpointer _metadata_date_time_ref0 (gpointer self) {
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 4699 "PhotoMetadata.c"
+#line 4697 "PhotoMetadata.c"
 }
 
 
@@ -4709,7 +4707,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) {
 	g_atomic_int_inc (&_data5_->_ref_count_);
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data5_;
-#line 4708 "PhotoMetadata.c"
+#line 4706 "PhotoMetadata.c"
 }
 
 
@@ -4718,7 +4716,7 @@ static void block5_data_unref (void * _userdata_) {
 	_data5_ = (Block5Data*) _userdata_;
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 4717 "PhotoMetadata.c"
+#line 4715 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data5_->self;
@@ -4728,7 +4726,7 @@ static void block5_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block5Data, _data5_);
-#line 4727 "PhotoMetadata.c"
+#line 4725 "PhotoMetadata.c"
 	}
 }
 
@@ -4747,14 +4745,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
 	_tmp1_ = _data5_->date_time;
 #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 4746 "PhotoMetadata.c"
+#line 4744 "PhotoMetadata.c"
 }
 
 
 static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda9_ (self, tag);
-#line 4753 "PhotoMetadata.c"
+#line 4751 "PhotoMetadata.c"
 }
 
 
@@ -4795,7 +4793,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
 	block5_data_unref (_data5_);
 #line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = NULL;
-#line 4794 "PhotoMetadata.c"
+#line 4792 "PhotoMetadata.c"
 }
 
 
@@ -4829,7 +4827,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp0_ = self->priv->exif;
 #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 4828 "PhotoMetadata.c"
+#line 4826 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4840,13 +4838,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		if (result_length1) {
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*result_length1 = _tmp1__length1;
-#line 4839 "PhotoMetadata.c"
+#line 4837 "PhotoMetadata.c"
 		}
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp1_;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4845 "PhotoMetadata.c"
+#line 4843 "PhotoMetadata.c"
 	}
 #line 588 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exif;
@@ -4864,7 +4862,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp6_ = include_preview;
 #line 590 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 4863 "PhotoMetadata.c"
+#line 4861 "PhotoMetadata.c"
 		ExifData* _tmp7_ = NULL;
 		ExifData* _tmp8_ = NULL;
 #line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4875,7 +4873,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		_tmp8_ = self->priv->exif;
 #line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_->size = (guint) 0;
-#line 4874 "PhotoMetadata.c"
+#line 4872 "PhotoMetadata.c"
 	}
 #line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened = NULL;
@@ -4895,21 +4893,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp11_ = saved_size;
 #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ > ((guint) 0)) {
-#line 4894 "PhotoMetadata.c"
+#line 4892 "PhotoMetadata.c"
 		guchar* _tmp12_ = NULL;
 #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = saved_data;
 #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12_ != NULL;
-#line 4900 "PhotoMetadata.c"
+#line 4898 "PhotoMetadata.c"
 	} else {
 #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 4904 "PhotoMetadata.c"
+#line 4902 "PhotoMetadata.c"
 	}
 #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 4908 "PhotoMetadata.c"
+#line 4906 "PhotoMetadata.c"
 		guint _tmp13_ = 0U;
 		guint8* _tmp14_ = NULL;
 		guint8* _tmp15_ = NULL;
@@ -4951,7 +4949,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		exif_mem_free (_tmp19_, _tmp20_);
 #line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_exif_mem_unref0 (_tmp19_);
-#line 4950 "PhotoMetadata.c"
+#line 4948 "PhotoMetadata.c"
 	}
 #line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = self->priv->exif;
@@ -4973,20 +4971,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	if (result_length1) {
 #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp25__length1;
-#line 4972 "PhotoMetadata.c"
+#line 4970 "PhotoMetadata.c"
 	}
 #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp25_;
 #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4978 "PhotoMetadata.c"
+#line 4976 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup5 (guint8* self, int length) {
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 4985 "PhotoMetadata.c"
+#line 4983 "PhotoMetadata.c"
 }
 
 
@@ -4999,7 +4997,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	gint _tmp0__length1 = 0;
 	gint __tmp0__size_ = 0;
 	GExiv2Metadata* _tmp1_ = NULL;
-	guchar* _tmp2_ = NULL;
+	guint8* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	guint8* _tmp6_ = NULL;
@@ -5022,7 +5020,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	_buffer_size_ = buffer_length1;
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 5021 "PhotoMetadata.c"
+#line 5019 "PhotoMetadata.c"
 		guchar* _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5035,7 +5033,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 		_tmp0__length1 = _tmp5__length1;
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5034 "PhotoMetadata.c"
+#line 5032 "PhotoMetadata.c"
 	} else {
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = NULL;
@@ -5043,7 +5041,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 		_tmp0__length1 = 0;
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5042 "PhotoMetadata.c"
+#line 5040 "PhotoMetadata.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
@@ -5057,7 +5055,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	if (result_length1) {
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp7__length1;
-#line 5056 "PhotoMetadata.c"
+#line 5054 "PhotoMetadata.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp7_;
@@ -5065,7 +5063,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	buffer = (g_free (buffer), NULL);
 #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5064 "PhotoMetadata.c"
+#line 5062 "PhotoMetadata.c"
 }
 
 
@@ -5098,7 +5096,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 	_tmp4__length1 = props_length1;
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 5097 "PhotoMetadata.c"
+#line 5095 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5107,17 +5105,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 		_tmp5__length1 = props_length1;
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5__length1;
-#line 5106 "PhotoMetadata.c"
+#line 5104 "PhotoMetadata.c"
 	} else {
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = 0;
-#line 5110 "PhotoMetadata.c"
+#line 5108 "PhotoMetadata.c"
 	}
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = (guint) _tmp3_;
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5116 "PhotoMetadata.c"
+#line 5114 "PhotoMetadata.c"
 }
 
 
@@ -5159,7 +5157,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	if (_tmp4_ == NULL) {
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 5158 "PhotoMetadata.c"
+#line 5156 "PhotoMetadata.c"
 	} else {
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
@@ -5172,7 +5170,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 		_tmp6_ = number;
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 5171 "PhotoMetadata.c"
+#line 5169 "PhotoMetadata.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
@@ -5180,7 +5178,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 		result = NULL;
 #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5179 "PhotoMetadata.c"
+#line 5177 "PhotoMetadata.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = self->priv->source_name;
@@ -5200,7 +5198,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
 #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5199 "PhotoMetadata.c"
+#line 5197 "PhotoMetadata.c"
 }
 
 
@@ -5217,7 +5215,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 	_tmp1_ = self->priv->exif;
 #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ != NULL) {
-#line 5216 "PhotoMetadata.c"
+#line 5214 "PhotoMetadata.c"
 		ExifMem* _tmp2_ = NULL;
 		ExifMem* _tmp3_ = NULL;
 		ExifData* _tmp4_ = NULL;
@@ -5244,7 +5242,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 		_tmp7_ = self->priv->exif;
 #line 641 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_->size = (guint) 0;
-#line 5243 "PhotoMetadata.c"
+#line 5241 "PhotoMetadata.c"
 	}
 }
 
@@ -5262,7 +5260,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
 	_tmp1_ = tag;
 #line 646 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 5261 "PhotoMetadata.c"
+#line 5259 "PhotoMetadata.c"
 }
 
 
@@ -5275,7 +5273,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 	_tmp0_ = tags;
 #line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5274 "PhotoMetadata.c"
+#line 5272 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -5287,14 +5285,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 		tag_collection_length1 = _tmp0__length1;
 #line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5286 "PhotoMetadata.c"
+#line 5284 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5293 "PhotoMetadata.c"
+#line 5291 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5303,7 +5301,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 				photo_metadata_remove_tag (self, _tmp2_);
 #line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5302 "PhotoMetadata.c"
+#line 5300 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5320,7 +5318,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 	switch (_tmp0_) {
 #line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 5319 "PhotoMetadata.c"
+#line 5317 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 #line 657 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5329,11 +5327,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_exif (_tmp1_);
 #line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5328 "PhotoMetadata.c"
+#line 5326 "PhotoMetadata.c"
 		}
 #line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 5332 "PhotoMetadata.c"
+#line 5330 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp2_ = NULL;
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5342,11 +5340,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_xmp (_tmp2_);
 #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5341 "PhotoMetadata.c"
+#line 5339 "PhotoMetadata.c"
 		}
 #line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 5345 "PhotoMetadata.c"
+#line 5343 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 #line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5355,12 +5353,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_iptc (_tmp3_);
 #line 666 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5354 "PhotoMetadata.c"
+#line 5352 "PhotoMetadata.c"
 		}
 		default:
 #line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 5359 "PhotoMetadata.c"
+#line 5357 "PhotoMetadata.c"
 	}
 }
 
@@ -5373,7 +5371,7 @@ void photo_metadata_clear (PhotoMetadata* self) {
 	_tmp0_ = self->priv->exiv2;
 #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear (_tmp0_);
-#line 5372 "PhotoMetadata.c"
+#line 5370 "PhotoMetadata.c"
 }
 
 
@@ -5394,7 +5392,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
 	result = _tmp1_;
 #line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5393 "PhotoMetadata.c"
+#line 5391 "PhotoMetadata.c"
 }
 
 
@@ -5408,7 +5406,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 	_tmp0_ = date_time;
 #line 686 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5407 "PhotoMetadata.c"
+#line 5405 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -5423,7 +5421,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 		_tmp3_ = option;
 #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5422 "PhotoMetadata.c"
+#line 5420 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -5433,7 +5431,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 		_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5432 "PhotoMetadata.c"
+#line 5430 "PhotoMetadata.c"
 	}
 }
 
@@ -5455,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5454 "PhotoMetadata.c"
+#line 5452 "PhotoMetadata.c"
 }
 
 
@@ -5469,7 +5467,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 	_tmp0_ = date_time;
 #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5468 "PhotoMetadata.c"
+#line 5466 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -5484,7 +5482,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 		_tmp3_ = option;
 #line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5483 "PhotoMetadata.c"
+#line 5481 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -5494,7 +5492,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 		_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
 #line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5493 "PhotoMetadata.c"
+#line 5491 "PhotoMetadata.c"
 	}
 }
 
@@ -5516,7 +5514,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5515 "PhotoMetadata.c"
+#line 5513 "PhotoMetadata.c"
 }
 
 
@@ -5530,7 +5528,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 	_tmp0_ = date_time;
 #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5529 "PhotoMetadata.c"
+#line 5527 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -5545,7 +5543,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 		_tmp3_ = option;
 #line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5544 "PhotoMetadata.c"
+#line 5542 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -5555,7 +5553,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 		_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
 #line 727 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5554 "PhotoMetadata.c"
+#line 5552 "PhotoMetadata.c"
 	}
 }
 
@@ -5576,7 +5574,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 	_tmp1_ = creation;
 #line 732 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ == NULL) {
-#line 5575 "PhotoMetadata.c"
+#line 5573 "PhotoMetadata.c"
 		MetadataDateTime* _tmp2_ = NULL;
 #line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_digitized_date_time (self);
@@ -5584,20 +5582,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 		_metadata_date_time_unref0 (creation);
 #line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		creation = _tmp2_;
-#line 5583 "PhotoMetadata.c"
+#line 5581 "PhotoMetadata.c"
 	}
 #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = creation;
 #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5589 "PhotoMetadata.c"
+#line 5587 "PhotoMetadata.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
 #line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 5596 "PhotoMetadata.c"
+#line 5594 "PhotoMetadata.c"
 }
 
 
@@ -5619,19 +5617,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
 #line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 5618 "PhotoMetadata.c"
+#line 5616 "PhotoMetadata.c"
 	{
 		gint ctr = 0;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		ctr = 0;
-#line 5623 "PhotoMetadata.c"
+#line 5621 "PhotoMetadata.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = TRUE;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 5630 "PhotoMetadata.c"
+#line 5628 "PhotoMetadata.c"
 				gint _tmp4_ = 0;
 				gchar** _tmp5_ = NULL;
 				gint _tmp5__length1 = 0;
@@ -5655,13 +5653,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				Dimensions* _tmp19_ = NULL;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp2_) {
-#line 5654 "PhotoMetadata.c"
+#line 5652 "PhotoMetadata.c"
 					gint _tmp3_ = 0;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp3_ = ctr;
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					ctr = _tmp3_ + 1;
-#line 5660 "PhotoMetadata.c"
+#line 5658 "PhotoMetadata.c"
 				}
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = FALSE;
@@ -5675,7 +5673,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!(_tmp4_ < _tmp5__length1)) {
 #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 5674 "PhotoMetadata.c"
+#line 5672 "PhotoMetadata.c"
 				}
 #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_WIDTH_TAGS;
@@ -5693,7 +5691,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!_tmp10_) {
 #line 760 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 5692 "PhotoMetadata.c"
+#line 5690 "PhotoMetadata.c"
 				}
 #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = photo_metadata_HEIGHT_TAGS;
@@ -5711,7 +5709,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!_tmp15_) {
 #line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 5710 "PhotoMetadata.c"
+#line 5708 "PhotoMetadata.c"
 				}
 #line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp16_ = width;
@@ -5725,7 +5723,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				result = _tmp19_;
 #line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5724 "PhotoMetadata.c"
+#line 5722 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5733,7 +5731,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	result = NULL;
 #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5732 "PhotoMetadata.c"
+#line 5730 "PhotoMetadata.c"
 }
 
 
@@ -5745,7 +5743,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 	_tmp0_ = dim;
 #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5744 "PhotoMetadata.c"
+#line 5742 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		Dimensions* _tmp2_ = NULL;
@@ -5780,7 +5778,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		_tmp8_ = option;
 #line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 5779 "PhotoMetadata.c"
+#line 5777 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -5798,7 +5796,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
 #line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 5797 "PhotoMetadata.c"
+#line 5795 "PhotoMetadata.c"
 	}
 }
 
@@ -5808,21 +5806,21 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5821 "PhotoMetadata.c"
+#line 5819 "PhotoMetadata.c"
 }
 
 
@@ -5830,19 +5828,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5841 "PhotoMetadata.c"
+#line 5839 "PhotoMetadata.c"
 }
 
 
@@ -5871,7 +5869,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
 #line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 5870 "PhotoMetadata.c"
+#line 5868 "PhotoMetadata.c"
 		GeeList* _tmp2_ = NULL;
 #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
@@ -5879,7 +5877,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_object_unref0 (_tmp0_);
 #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp2_;
-#line 5878 "PhotoMetadata.c"
+#line 5876 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
@@ -5894,7 +5892,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_object_unref0 (_tmp0_);
 #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp4_;
-#line 5893 "PhotoMetadata.c"
+#line 5891 "PhotoMetadata.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _g_object_ref0 (_tmp0_);
@@ -5904,7 +5902,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp8_ = titles;
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_ != NULL) {
-#line 5903 "PhotoMetadata.c"
+#line 5901 "PhotoMetadata.c"
 		GeeList* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
@@ -5916,15 +5914,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp11_ = _tmp10_;
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp11_ > 0;
-#line 5915 "PhotoMetadata.c"
+#line 5913 "PhotoMetadata.c"
 	} else {
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = FALSE;
-#line 5919 "PhotoMetadata.c"
+#line 5917 "PhotoMetadata.c"
 	}
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_) {
-#line 5923 "PhotoMetadata.c"
+#line 5921 "PhotoMetadata.c"
 		GeeList* _tmp12_ = NULL;
 		gpointer _tmp13_ = NULL;
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5935,13 +5933,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_free0 (_tmp6_);
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = (gchar*) _tmp13_;
-#line 5934 "PhotoMetadata.c"
+#line 5932 "PhotoMetadata.c"
 	} else {
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = NULL;
-#line 5940 "PhotoMetadata.c"
+#line 5938 "PhotoMetadata.c"
 	}
 #line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strdup (_tmp6_);
@@ -5951,7 +5949,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp15_ = title;
 #line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15_ != NULL) {
-#line 5950 "PhotoMetadata.c"
+#line 5948 "PhotoMetadata.c"
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 #line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5962,7 +5960,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_free0 (title);
 #line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		title = _tmp17_;
-#line 5961 "PhotoMetadata.c"
+#line 5959 "PhotoMetadata.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = title;
@@ -5970,7 +5968,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp22_ = is_string_empty (_tmp21_);
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp22_) {
-#line 5969 "PhotoMetadata.c"
+#line 5967 "PhotoMetadata.c"
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5979,15 +5977,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp24_ = string_contains (_tmp23_, "\n");
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = !_tmp24_;
-#line 5978 "PhotoMetadata.c"
+#line 5976 "PhotoMetadata.c"
 	} else {
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = FALSE;
-#line 5982 "PhotoMetadata.c"
+#line 5980 "PhotoMetadata.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_) {
-#line 5986 "PhotoMetadata.c"
+#line 5984 "PhotoMetadata.c"
 		const gchar* _tmp25_ = NULL;
 		gboolean _tmp26_ = FALSE;
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5996,25 +5994,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp26_ = string_contains (_tmp25_, "\r");
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = !_tmp26_;
-#line 5995 "PhotoMetadata.c"
+#line 5993 "PhotoMetadata.c"
 	} else {
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 5999 "PhotoMetadata.c"
+#line 5997 "PhotoMetadata.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 6003 "PhotoMetadata.c"
+#line 6001 "PhotoMetadata.c"
 		const gchar* _tmp27_ = NULL;
 #line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = title;
 #line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = _tmp27_;
-#line 6009 "PhotoMetadata.c"
+#line 6007 "PhotoMetadata.c"
 	} else {
 #line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = NULL;
-#line 6013 "PhotoMetadata.c"
+#line 6011 "PhotoMetadata.c"
 	}
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = g_strdup (_tmp18_);
@@ -6030,7 +6028,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_g_object_unref0 (_tmp0_);
 #line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6029 "PhotoMetadata.c"
+#line 6027 "PhotoMetadata.c"
 }
 
 
@@ -6045,19 +6043,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 	_tmp1_ = is_string_empty (_tmp0_);
 #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6044 "PhotoMetadata.c"
+#line 6042 "PhotoMetadata.c"
 		gboolean _tmp2_ = FALSE;
 #line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
 #line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp2_) {
-#line 6050 "PhotoMetadata.c"
+#line 6048 "PhotoMetadata.c"
 			const gchar* _tmp3_ = NULL;
 #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = title;
 #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6056 "PhotoMetadata.c"
+#line 6054 "PhotoMetadata.c"
 		} else {
 			gchar** _tmp4_ = NULL;
 			gint _tmp4__length1 = 0;
@@ -6073,7 +6071,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 			_tmp6_ = option;
 #line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6072 "PhotoMetadata.c"
+#line 6070 "PhotoMetadata.c"
 		}
 	} else {
 		gchar** _tmp7_ = NULL;
@@ -6084,7 +6082,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 		_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
 #line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 6083 "PhotoMetadata.c"
+#line 6081 "PhotoMetadata.c"
 	}
 }
 
@@ -6101,7 +6099,7 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
 	result = _tmp0_;
 #line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6100 "PhotoMetadata.c"
+#line 6098 "PhotoMetadata.c"
 }
 
 
@@ -6116,17 +6114,17 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment) {
 	_tmp1_ = is_string_empty (_tmp0_);
 #line 853 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6115 "PhotoMetadata.c"
+#line 6113 "PhotoMetadata.c"
 		const gchar* _tmp2_ = NULL;
 #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = comment;
 #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Exif.Photo.UserComment", _tmp2_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
-#line 6121 "PhotoMetadata.c"
+#line 6119 "PhotoMetadata.c"
 	} else {
 #line 856 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tag (self, "Exif.Photo.UserComment");
-#line 6125 "PhotoMetadata.c"
+#line 6123 "PhotoMetadata.c"
 	}
 }
 
@@ -6148,7 +6146,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	_tmp0_ = photo_metadata_KEYWORD_TAGS;
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 6147 "PhotoMetadata.c"
+#line 6145 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -6160,14 +6158,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 		tag_collection_length1 = _tmp0__length1;
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6159 "PhotoMetadata.c"
+#line 6157 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 6166 "PhotoMetadata.c"
+#line 6164 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -6184,7 +6182,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 				_tmp5_ = values;
 #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 6183 "PhotoMetadata.c"
+#line 6181 "PhotoMetadata.c"
 					GeeCollection* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
@@ -6196,21 +6194,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 					_tmp8_ = _tmp7_;
 #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 6195 "PhotoMetadata.c"
+#line 6193 "PhotoMetadata.c"
 				} else {
 #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 6199 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
 				}
 #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 6203 "PhotoMetadata.c"
+#line 6201 "PhotoMetadata.c"
 					GeeSet* _tmp9_ = NULL;
 #line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = keywords;
 #line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp9_ == NULL) {
-#line 6209 "PhotoMetadata.c"
+#line 6207 "PhotoMetadata.c"
 						GCompareDataFunc _tmp10_ = NULL;
 						void* _tmp10__target = NULL;
 						GDestroyNotify _tmp10__target_destroy_notify = NULL;
@@ -6229,7 +6227,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 						_g_object_unref0 (keywords);
 #line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						keywords = _tmp11_;
-#line 6228 "PhotoMetadata.c"
+#line 6226 "PhotoMetadata.c"
 					}
 					{
 						GeeIterator* _current_value_it = NULL;
@@ -6243,7 +6241,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 						_current_value_it = _tmp13_;
 #line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 6242 "PhotoMetadata.c"
+#line 6240 "PhotoMetadata.c"
 							GeeIterator* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
 							gchar* current_value = NULL;
@@ -6261,7 +6259,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							if (!_tmp15_) {
 #line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 6260 "PhotoMetadata.c"
+#line 6258 "PhotoMetadata.c"
 							}
 #line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = _current_value_it;
@@ -6283,18 +6281,18 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							_g_free0 (_tmp21_);
 #line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (current_value);
-#line 6282 "PhotoMetadata.c"
+#line 6280 "PhotoMetadata.c"
 						}
 #line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_current_value_it);
-#line 6286 "PhotoMetadata.c"
+#line 6284 "PhotoMetadata.c"
 					}
 				}
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 6293 "PhotoMetadata.c"
+#line 6291 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6302,7 +6300,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	_tmp24_ = keywords;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp24_ != NULL) {
-#line 6301 "PhotoMetadata.c"
+#line 6299 "PhotoMetadata.c"
 		GeeSet* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
@@ -6314,25 +6312,25 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 		_tmp27_ = _tmp26_;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp27_ > 0;
-#line 6313 "PhotoMetadata.c"
+#line 6311 "PhotoMetadata.c"
 	} else {
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = FALSE;
-#line 6317 "PhotoMetadata.c"
+#line 6315 "PhotoMetadata.c"
 	}
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp23_) {
-#line 6321 "PhotoMetadata.c"
+#line 6319 "PhotoMetadata.c"
 		GeeSet* _tmp28_ = NULL;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp28_ = keywords;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp28_;
-#line 6327 "PhotoMetadata.c"
+#line 6325 "PhotoMetadata.c"
 	} else {
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 6331 "PhotoMetadata.c"
+#line 6329 "PhotoMetadata.c"
 	}
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -6350,27 +6348,27 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	compare_func_target_destroy_notify = NULL;
 #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6349 "PhotoMetadata.c"
+#line 6347 "PhotoMetadata.c"
 }
 
 
 static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 6356 "PhotoMetadata.c"
+#line 6354 "PhotoMetadata.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 6369 "PhotoMetadata.c"
+#line 6367 "PhotoMetadata.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6383,100 +6381,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6400 "PhotoMetadata.c"
+#line 6398 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6409 "PhotoMetadata.c"
+#line 6407 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6425 "PhotoMetadata.c"
+#line 6423 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6436 "PhotoMetadata.c"
+#line 6434 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6450 "PhotoMetadata.c"
+#line 6448 "PhotoMetadata.c"
 	}
 	goto __finally25;
 	__catch25_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 6464 "PhotoMetadata.c"
+#line 6462 "PhotoMetadata.c"
 	}
 	__finally25:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		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);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 6475 "PhotoMetadata.c"
+#line 6473 "PhotoMetadata.c"
 	}
 }
 
@@ -6488,39 +6486,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 6499 "PhotoMetadata.c"
+#line 6497 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6507 "PhotoMetadata.c"
+#line 6505 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6519 "PhotoMetadata.c"
+#line 6517 "PhotoMetadata.c"
 	}
 }
 
@@ -6538,114 +6536,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 6543 "PhotoMetadata.c"
+#line 6541 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 6549 "PhotoMetadata.c"
+#line 6547 "PhotoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 6553 "PhotoMetadata.c"
+#line 6551 "PhotoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 6557 "PhotoMetadata.c"
+#line 6555 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 6569 "PhotoMetadata.c"
+#line 6567 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 6579 "PhotoMetadata.c"
+#line 6577 "PhotoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 6585 "PhotoMetadata.c"
+#line 6583 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 6599 "PhotoMetadata.c"
+#line 6597 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 6609 "PhotoMetadata.c"
+#line 6607 "PhotoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 6615 "PhotoMetadata.c"
+#line 6613 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 6624 "PhotoMetadata.c"
+#line 6622 "PhotoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6644 "PhotoMetadata.c"
+#line 6642 "PhotoMetadata.c"
 }
 
 
@@ -6663,7 +6661,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6662 "PhotoMetadata.c"
+#line 6660 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -6675,14 +6673,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp0__length1;
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 6674 "PhotoMetadata.c"
+#line 6672 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp1_;
-#line 6681 "PhotoMetadata.c"
+#line 6679 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp2_ = NULL;
 				const gchar* _tmp3_ = NULL;
@@ -6694,7 +6692,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				photo_metadata_remove_tag (self, _tmp3_);
 #line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 6693 "PhotoMetadata.c"
+#line 6691 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6704,13 +6702,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	if (_tmp4_ == NULL) {
 #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 6703 "PhotoMetadata.c"
+#line 6701 "PhotoMetadata.c"
 	}
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6709 "PhotoMetadata.c"
+#line 6707 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -6722,14 +6720,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp5__length1;
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 6721 "PhotoMetadata.c"
+#line 6719 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp6_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp6_;
-#line 6728 "PhotoMetadata.c"
+#line 6726 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp7_ = NULL;
 				gboolean _tmp8_ = FALSE;
@@ -6748,13 +6746,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_hierarchical_keyword_field_unref0 (current_field);
 #line 897 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6747 "PhotoMetadata.c"
+#line 6745 "PhotoMetadata.c"
 				}
 #line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
 #line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 6753 "PhotoMetadata.c"
+#line 6751 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_path_it = NULL;
 					HierarchicalTagIndex* _tmp10_ = NULL;
@@ -6778,7 +6776,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_current_path_it = _tmp14_;
 #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 6777 "PhotoMetadata.c"
+#line 6775 "PhotoMetadata.c"
 						GeeIterator* _tmp15_ = NULL;
 						gboolean _tmp16_ = FALSE;
 						gchar* current_path = NULL;
@@ -6801,7 +6799,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						if (!_tmp16_) {
 #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 6800 "PhotoMetadata.c"
+#line 6798 "PhotoMetadata.c"
 						}
 #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_path_it;
@@ -6825,7 +6823,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_tmp24_ = _tmp23_->wants_leading_separator;
 #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp24_) {
-#line 6824 "PhotoMetadata.c"
+#line 6822 "PhotoMetadata.c"
 							const gchar* _tmp25_ = NULL;
 							gchar* _tmp26_ = NULL;
 #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6836,7 +6834,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 							_g_free0 (writeable_path);
 #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							writeable_path = _tmp26_;
-#line 6835 "PhotoMetadata.c"
+#line 6833 "PhotoMetadata.c"
 						}
 #line 907 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp27_ = writeable_set;
@@ -6848,11 +6846,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_g_free0 (writeable_path);
 #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_path);
-#line 6847 "PhotoMetadata.c"
+#line 6845 "PhotoMetadata.c"
 					}
 #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_path_it);
-#line 6851 "PhotoMetadata.c"
+#line 6849 "PhotoMetadata.c"
 				}
 #line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp29_ = current_field;
@@ -6866,7 +6864,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				_g_object_unref0 (writeable_set);
 #line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 6865 "PhotoMetadata.c"
+#line 6863 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6896,7 +6894,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 	_tmp2_ = keywords;
 #line 918 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 6895 "PhotoMetadata.c"
+#line 6893 "PhotoMetadata.c"
 		GeeSet* _tmp24_ = NULL;
 		HierarchicalTagIndex* _tmp25_ = NULL;
 		GeeCollection* _tmp26_ = NULL;
@@ -6913,7 +6911,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 			_keyword_it = _tmp4_;
 #line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 6912 "PhotoMetadata.c"
+#line 6910 "PhotoMetadata.c"
 				GeeIterator* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
 				gchar* keyword = NULL;
@@ -6929,7 +6927,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				if (!_tmp6_) {
 #line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 6928 "PhotoMetadata.c"
+#line 6926 "PhotoMetadata.c"
 				}
 #line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _keyword_it;
@@ -6943,7 +6941,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
 #line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp10_) {
-#line 6942 "PhotoMetadata.c"
+#line 6940 "PhotoMetadata.c"
 					GeeCollection* path_components = NULL;
 					const gchar* _tmp11_ = NULL;
 					GeeList* _tmp12_ = NULL;
@@ -6953,7 +6951,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 					_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
 #line 921 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 6952 "PhotoMetadata.c"
+#line 6950 "PhotoMetadata.c"
 					{
 						GeeIterator* _component_it = NULL;
 						GeeCollection* _tmp13_ = NULL;
@@ -6966,7 +6964,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 						_component_it = _tmp14_;
 #line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 6965 "PhotoMetadata.c"
+#line 6963 "PhotoMetadata.c"
 							GeeIterator* _tmp15_ = NULL;
 							gboolean _tmp16_ = FALSE;
 							gchar* component = NULL;
@@ -6983,7 +6981,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							if (!_tmp16_) {
 #line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 6982 "PhotoMetadata.c"
+#line 6980 "PhotoMetadata.c"
 							}
 #line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = _component_it;
@@ -7001,15 +6999,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
 #line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (component);
-#line 7000 "PhotoMetadata.c"
+#line 6998 "PhotoMetadata.c"
 						}
 #line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_component_it);
-#line 7004 "PhotoMetadata.c"
+#line 7002 "PhotoMetadata.c"
 					}
 #line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (path_components);
-#line 7008 "PhotoMetadata.c"
+#line 7006 "PhotoMetadata.c"
 				} else {
 					GeeSet* _tmp22_ = NULL;
 					const gchar* _tmp23_ = NULL;
@@ -7019,15 +7017,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 					_tmp23_ = keyword;
 #line 926 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7018 "PhotoMetadata.c"
+#line 7016 "PhotoMetadata.c"
 				}
 #line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (keyword);
-#line 7022 "PhotoMetadata.c"
+#line 7020 "PhotoMetadata.c"
 			}
 #line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_keyword_it);
-#line 7026 "PhotoMetadata.c"
+#line 7024 "PhotoMetadata.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = flat_keywords;
@@ -7041,13 +7039,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
 #line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp27_);
-#line 7040 "PhotoMetadata.c"
+#line 7038 "PhotoMetadata.c"
 	}
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = keywords;
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp28_ != NULL) {
-#line 7046 "PhotoMetadata.c"
+#line 7044 "PhotoMetadata.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		GeeSet* _tmp30_ = NULL;
@@ -7067,7 +7065,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		_tmp32_ = htag_index;
 #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 7066 "PhotoMetadata.c"
+#line 7064 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp33_ = NULL;
 		gint _tmp33__length1 = 0;
@@ -7079,13 +7077,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
 #line 938 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 7078 "PhotoMetadata.c"
+#line 7076 "PhotoMetadata.c"
 	}
 #line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (flat_keywords);
 #line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_hierarchical_tag_index_unref0 (htag_index);
-#line 7084 "PhotoMetadata.c"
+#line 7082 "PhotoMetadata.c"
 }
 
 
@@ -7099,7 +7097,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7098 "PhotoMetadata.c"
+#line 7096 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -7111,14 +7109,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp0__length1;
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 7110 "PhotoMetadata.c"
+#line 7108 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* field = NULL;
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp1_;
-#line 7117 "PhotoMetadata.c"
+#line 7115 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp2_ = NULL;
@@ -7138,7 +7136,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 				_tmp6_ = values;
 #line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp6_ != NULL) {
-#line 7137 "PhotoMetadata.c"
+#line 7135 "PhotoMetadata.c"
 					GeeCollection* _tmp7_ = NULL;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
@@ -7150,11 +7148,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp9_ = _tmp8_;
 #line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = _tmp9_ > 0;
-#line 7149 "PhotoMetadata.c"
+#line 7147 "PhotoMetadata.c"
 				} else {
 #line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = FALSE;
-#line 7153 "PhotoMetadata.c"
+#line 7151 "PhotoMetadata.c"
 				}
 #line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_) {
@@ -7166,13 +7164,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 7165 "PhotoMetadata.c"
+#line 7163 "PhotoMetadata.c"
 				}
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 7171 "PhotoMetadata.c"
+#line 7169 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7180,7 +7178,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	result = FALSE;
 #line 950 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7179 "PhotoMetadata.c"
+#line 7177 "PhotoMetadata.c"
 }
 
 
@@ -7205,7 +7203,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7204 "PhotoMetadata.c"
+#line 7202 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -7217,14 +7215,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp2__length1;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 7216 "PhotoMetadata.c"
+#line 7214 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp3_ = NULL;
 			HierarchicalKeywordField* field = NULL;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp3_;
-#line 7223 "PhotoMetadata.c"
+#line 7221 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp4_ = NULL;
@@ -7246,7 +7244,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				if (_tmp8_ == NULL) {
 #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = TRUE;
-#line 7245 "PhotoMetadata.c"
+#line 7243 "PhotoMetadata.c"
 				} else {
 					GeeCollection* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
@@ -7259,7 +7257,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp11_ = _tmp10_;
 #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = _tmp11_ < 1;
-#line 7258 "PhotoMetadata.c"
+#line 7256 "PhotoMetadata.c"
 				}
 #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp7_) {
@@ -7269,7 +7267,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 7268 "PhotoMetadata.c"
+#line 7266 "PhotoMetadata.c"
 				}
 				{
 					GeeIterator* _current_value_it = NULL;
@@ -7283,7 +7281,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_current_value_it = _tmp13_;
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 7282 "PhotoMetadata.c"
+#line 7280 "PhotoMetadata.c"
 						GeeIterator* _tmp14_ = NULL;
 						gboolean _tmp15_ = FALSE;
 						gchar* current_value = NULL;
@@ -7303,7 +7301,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						if (!_tmp15_) {
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 7302 "PhotoMetadata.c"
+#line 7300 "PhotoMetadata.c"
 						}
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp16_ = _current_value_it;
@@ -7325,7 +7323,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						_tmp22_ = canonicalized;
 #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (_tmp22_ != NULL) {
-#line 7324 "PhotoMetadata.c"
+#line 7322 "PhotoMetadata.c"
 							GeeSet* _tmp23_ = NULL;
 							const gchar* _tmp24_ = NULL;
 #line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7334,23 +7332,23 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							_tmp24_ = canonicalized;
 #line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_);
-#line 7333 "PhotoMetadata.c"
+#line 7331 "PhotoMetadata.c"
 						}
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (canonicalized);
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 7339 "PhotoMetadata.c"
+#line 7337 "PhotoMetadata.c"
 					}
 #line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_it);
-#line 7343 "PhotoMetadata.c"
+#line 7341 "PhotoMetadata.c"
 				}
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 7349 "PhotoMetadata.c"
+#line 7347 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7358,7 +7356,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	result = h_keywords;
 #line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7357 "PhotoMetadata.c"
+#line 7355 "PhotoMetadata.c"
 }
 
 
@@ -7376,7 +7374,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
 #line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7375 "PhotoMetadata.c"
+#line 7373 "PhotoMetadata.c"
 }
 
 
@@ -7402,27 +7400,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 7401 "PhotoMetadata.c"
+#line 7399 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp5_ = 0;
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = orientation;
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 7408 "PhotoMetadata.c"
+#line 7406 "PhotoMetadata.c"
 	}
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = TRUE;
-#line 7414 "PhotoMetadata.c"
+#line 7412 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp6_ = 0;
 #line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = orientation;
 #line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 7421 "PhotoMetadata.c"
+#line 7419 "PhotoMetadata.c"
 	}
 #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_) {
@@ -7430,7 +7428,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 		result = ORIENTATION_TOP_LEFT;
 #line 987 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7429 "PhotoMetadata.c"
+#line 7427 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp7_ = 0;
 #line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7439,7 +7437,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 		result = (Orientation) _tmp7_;
 #line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7438 "PhotoMetadata.c"
+#line 7436 "PhotoMetadata.c"
 	}
 }
 
@@ -7455,7 +7453,7 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
 	_tmp1_ = orientation;
 #line 994 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 7454 "PhotoMetadata.c"
+#line 7452 "PhotoMetadata.c"
 }
 
 
@@ -7501,43 +7499,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 		if (longitude) {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*longitude = _vala_longitude;
-#line 7500 "PhotoMetadata.c"
+#line 7498 "PhotoMetadata.c"
 		}
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (long_ref) {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*long_ref = _vala_long_ref;
-#line 7506 "PhotoMetadata.c"
+#line 7504 "PhotoMetadata.c"
 		} else {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_long_ref);
-#line 7510 "PhotoMetadata.c"
+#line 7508 "PhotoMetadata.c"
 		}
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (latitude) {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*latitude = _vala_latitude;
-#line 7516 "PhotoMetadata.c"
+#line 7514 "PhotoMetadata.c"
 		}
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (lat_ref) {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*lat_ref = _vala_lat_ref;
-#line 7522 "PhotoMetadata.c"
+#line 7520 "PhotoMetadata.c"
 		} else {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_lat_ref);
-#line 7526 "PhotoMetadata.c"
+#line 7524 "PhotoMetadata.c"
 		}
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (altitude) {
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*altitude = _vala_altitude;
-#line 7532 "PhotoMetadata.c"
+#line 7530 "PhotoMetadata.c"
 		}
 #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7536 "PhotoMetadata.c"
+#line 7534 "PhotoMetadata.c"
 	}
 #line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7557,43 +7555,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 	if (longitude) {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*longitude = _vala_longitude;
-#line 7556 "PhotoMetadata.c"
+#line 7554 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (long_ref) {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*long_ref = _vala_long_ref;
-#line 7562 "PhotoMetadata.c"
+#line 7560 "PhotoMetadata.c"
 	} else {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 7566 "PhotoMetadata.c"
+#line 7564 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (latitude) {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*latitude = _vala_latitude;
-#line 7572 "PhotoMetadata.c"
+#line 7570 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (lat_ref) {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*lat_ref = _vala_lat_ref;
-#line 7578 "PhotoMetadata.c"
+#line 7576 "PhotoMetadata.c"
 	} else {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 7582 "PhotoMetadata.c"
+#line 7580 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (altitude) {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*altitude = _vala_altitude;
-#line 7588 "PhotoMetadata.c"
+#line 7586 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7592 "PhotoMetadata.c"
+#line 7590 "PhotoMetadata.c"
 }
 
 
@@ -7614,11 +7612,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	if (exposure) {
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*exposure = _vala_exposure;
-#line 7613 "PhotoMetadata.c"
+#line 7611 "PhotoMetadata.c"
 	}
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7617 "PhotoMetadata.c"
+#line 7615 "PhotoMetadata.c"
 }
 
 
@@ -7641,7 +7639,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7640 "PhotoMetadata.c"
+#line 7638 "PhotoMetadata.c"
 	}
 #line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = metadata_rational_is_valid (&exposure_time);
@@ -7651,7 +7649,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7650 "PhotoMetadata.c"
+#line 7648 "PhotoMetadata.c"
 	}
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7659,7 +7657,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	result = _tmp3_;
 #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7658 "PhotoMetadata.c"
+#line 7656 "PhotoMetadata.c"
 }
 
 
@@ -7690,11 +7688,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 		if (iso) {
 #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 7689 "PhotoMetadata.c"
+#line 7687 "PhotoMetadata.c"
 		}
 #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7693 "PhotoMetadata.c"
+#line 7691 "PhotoMetadata.c"
 	}
 #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _vala_iso;
@@ -7702,14 +7700,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (_tmp4_ < ((glong) 6)) {
 #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 7701 "PhotoMetadata.c"
+#line 7699 "PhotoMetadata.c"
 	} else {
 		glong _tmp5_ = 0L;
 #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _vala_iso;
 #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 7708 "PhotoMetadata.c"
+#line 7706 "PhotoMetadata.c"
 	}
 #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
@@ -7719,11 +7717,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 		if (iso) {
 #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 7718 "PhotoMetadata.c"
+#line 7716 "PhotoMetadata.c"
 		}
 #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7722 "PhotoMetadata.c"
+#line 7720 "PhotoMetadata.c"
 	}
 #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
@@ -7731,11 +7729,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (iso) {
 #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*iso = _vala_iso;
-#line 7730 "PhotoMetadata.c"
+#line 7728 "PhotoMetadata.c"
 	}
 #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7734 "PhotoMetadata.c"
+#line 7732 "PhotoMetadata.c"
 }
 
 
@@ -7757,7 +7755,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7756 "PhotoMetadata.c"
+#line 7754 "PhotoMetadata.c"
 	}
 #line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7765,7 +7763,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	result = _tmp2_;
 #line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7764 "PhotoMetadata.c"
+#line 7762 "PhotoMetadata.c"
 }
 
 
@@ -7786,11 +7784,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	if (aperture) {
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*aperture = _vala_aperture;
-#line 7785 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
 	}
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7789 "PhotoMetadata.c"
+#line 7787 "PhotoMetadata.c"
 }
 
 
@@ -7826,7 +7824,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 		result = NULL;
 #line 1056 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7825 "PhotoMetadata.c"
+#line 7823 "PhotoMetadata.c"
 	}
 #line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = aperture;
@@ -7848,11 +7846,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (_tmp8_) {
 #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "<i>f</i>/";
-#line 7847 "PhotoMetadata.c"
+#line 7845 "PhotoMetadata.c"
 	} else {
 #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "f/";
-#line 7851 "PhotoMetadata.c"
+#line 7849 "PhotoMetadata.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = aperture_value;
@@ -7860,11 +7858,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.0f";
-#line 7859 "PhotoMetadata.c"
+#line 7857 "PhotoMetadata.c"
 	} else {
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.1f";
-#line 7863 "PhotoMetadata.c"
+#line 7861 "PhotoMetadata.c"
 	}
 #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = aperture_value;
@@ -7882,7 +7880,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	result = _tmp15_;
 #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7881 "PhotoMetadata.c"
+#line 7879 "PhotoMetadata.c"
 }
 
 
@@ -7897,7 +7895,7 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7896 "PhotoMetadata.c"
+#line 7894 "PhotoMetadata.c"
 }
 
 
@@ -7912,7 +7910,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7911 "PhotoMetadata.c"
+#line 7909 "PhotoMetadata.c"
 }
 
 
@@ -7933,11 +7931,11 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	if (flash) {
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*flash = _vala_flash;
-#line 7932 "PhotoMetadata.c"
+#line 7930 "PhotoMetadata.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7936 "PhotoMetadata.c"
+#line 7934 "PhotoMetadata.c"
 }
 
 
@@ -7952,7 +7950,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7951 "PhotoMetadata.c"
+#line 7949 "PhotoMetadata.c"
 }
 
 
@@ -7973,11 +7971,11 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	if (focal_length) {
 #line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*focal_length = _vala_focal_length;
-#line 7972 "PhotoMetadata.c"
+#line 7970 "PhotoMetadata.c"
 	}
 #line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7976 "PhotoMetadata.c"
+#line 7974 "PhotoMetadata.c"
 }
 
 
@@ -7992,7 +7990,7 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7991 "PhotoMetadata.c"
+#line 7989 "PhotoMetadata.c"
 }
 
 
@@ -8013,7 +8011,7 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8012 "PhotoMetadata.c"
+#line 8010 "PhotoMetadata.c"
 }
 
 
@@ -8028,7 +8026,7 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8027 "PhotoMetadata.c"
+#line 8025 "PhotoMetadata.c"
 }
 
 
@@ -8043,7 +8041,7 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8042 "PhotoMetadata.c"
+#line 8040 "PhotoMetadata.c"
 }
 
 
@@ -8075,7 +8073,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 	_tmp4_ = photo_metadata_has_iptc (self);
 #line 1112 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 8074 "PhotoMetadata.c"
+#line 8072 "PhotoMetadata.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8086,7 +8084,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 		_tmp6_ = version;
 #line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 8085 "PhotoMetadata.c"
+#line 8083 "PhotoMetadata.c"
 	}
 }
 
@@ -8100,7 +8098,7 @@ void photo_metadata_remove_software (PhotoMetadata* self) {
 	photo_metadata_remove_tag (self, "Iptc.Application2.Program");
 #line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 8099 "PhotoMetadata.c"
+#line 8097 "PhotoMetadata.c"
 }
 
 
@@ -8115,7 +8113,7 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8114 "PhotoMetadata.c"
+#line 8112 "PhotoMetadata.c"
 }
 
 
@@ -8146,7 +8144,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp2_ = rating_string;
 #line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 8145 "PhotoMetadata.c"
+#line 8143 "PhotoMetadata.c"
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		Rating _tmp5_ = 0;
@@ -8162,7 +8160,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8161 "PhotoMetadata.c"
+#line 8159 "PhotoMetadata.c"
 	}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8180,7 +8178,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8179 "PhotoMetadata.c"
+#line 8177 "PhotoMetadata.c"
 	}
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = rating_string;
@@ -8188,32 +8186,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp9_ = atoi (_tmp8_);
 #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_percent_rating = _tmp9_;
-#line 8187 "PhotoMetadata.c"
+#line 8185 "PhotoMetadata.c"
 	{
 		gint i = 0;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		i = 5;
-#line 8192 "PhotoMetadata.c"
+#line 8190 "PhotoMetadata.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = TRUE;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 8199 "PhotoMetadata.c"
+#line 8197 "PhotoMetadata.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				gint _tmp15_ = 0;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 8206 "PhotoMetadata.c"
+#line 8204 "PhotoMetadata.c"
 					gint _tmp11_ = 0;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = i;
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					i = _tmp11_ - 1;
-#line 8212 "PhotoMetadata.c"
+#line 8210 "PhotoMetadata.c"
 				}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = FALSE;
@@ -8223,7 +8221,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				if (!(_tmp12_ >= 0)) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 8222 "PhotoMetadata.c"
+#line 8220 "PhotoMetadata.c"
 				}
 #line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = int_percent_rating;
@@ -8233,7 +8231,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
 #line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_ >= _tmp15_) {
-#line 8232 "PhotoMetadata.c"
+#line 8230 "PhotoMetadata.c"
 					gint _tmp16_ = 0;
 					Rating _tmp17_ = 0;
 #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8246,7 +8244,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 					_g_free0 (rating_string);
 #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 8245 "PhotoMetadata.c"
+#line 8243 "PhotoMetadata.c"
 				}
 			}
 		}
@@ -8259,7 +8257,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_g_free0 (rating_string);
 #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8258 "PhotoMetadata.c"
+#line 8256 "PhotoMetadata.c"
 }
 
 
@@ -8306,7 +8304,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	_tmp8_ = int_rating;
 #line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (0 <= _tmp8_) {
-#line 8305 "PhotoMetadata.c"
+#line 8303 "PhotoMetadata.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
@@ -8323,7 +8321,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp12_);
-#line 8322 "PhotoMetadata.c"
+#line 8320 "PhotoMetadata.c"
 	} else {
 		gint _tmp13_ = 0;
 		gchar* _tmp14_ = NULL;
@@ -8338,7 +8336,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp15_);
-#line 8337 "PhotoMetadata.c"
+#line 8335 "PhotoMetadata.c"
 	}
 }
 
@@ -8346,7 +8344,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 8345 "PhotoMetadata.c"
+#line 8343 "PhotoMetadata.c"
 }
 
 
@@ -8372,7 +8370,7 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	g_return_val_if_fail (props != NULL, NULL);
+	g_return_val_if_fail (GEXIV2_IS_PREVIEW_PROPERTIES (props), NULL);
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = name;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8413,21 +8411,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 	self->number = _tmp14_;
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 8412 "PhotoMetadata.c"
+#line 8410 "PhotoMetadata.c"
 }
 
 
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 8419 "PhotoMetadata.c"
+#line 8417 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup6 (guint8* self, int length) {
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 8426 "PhotoMetadata.c"
+#line 8424 "PhotoMetadata.c"
 }
 
 
@@ -8452,7 +8450,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	GExiv2PreviewProperties* _tmp12_ = NULL;
 	GExiv2PreviewImage* _tmp13_ = NULL;
 	GExiv2PreviewImage* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
+	guint32 _tmp15_;
 	guint8* _tmp16_ = NULL;
 	guint8* _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
@@ -8480,7 +8478,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	_tmp5__length1 = props_length1;
 #line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ != NULL) {
-#line 8479 "PhotoMetadata.c"
+#line 8477 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		guint _tmp7_ = 0U;
@@ -8492,11 +8490,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 		_tmp7_ = self->number;
 #line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 8491 "PhotoMetadata.c"
+#line 8489 "PhotoMetadata.c"
 	} else {
 #line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = FALSE;
-#line 8495 "PhotoMetadata.c"
+#line 8493 "PhotoMetadata.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -8527,7 +8525,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18__length1 = _tmp17__length1;
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_gexiv2_preview_image_free0 (_tmp14_);
+	_g_object_unref0 (_tmp14_);
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_ = _tmp18_;
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8536,13 +8534,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	if (result_length1) {
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp19__length1;
-#line 8535 "PhotoMetadata.c"
+#line 8533 "PhotoMetadata.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp19_;
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8541 "PhotoMetadata.c"
+#line 8539 "PhotoMetadata.c"
 }
 
 
@@ -8553,7 +8551,7 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
 	((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
 #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->flatten = photo_metadata_internal_photo_preview_real_flatten;
-#line 8552 "PhotoMetadata.c"
+#line 8550 "PhotoMetadata.c"
 }
 
 
@@ -8569,7 +8567,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
 	_media_metadata_unref0 (self->owner);
 #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 8568 "PhotoMetadata.c"
+#line 8566 "PhotoMetadata.c"
 }
 
 
@@ -8840,7 +8838,7 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 	photo_metadata_RATING_TAGS = _tmp43_;
 #line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_RATING_TAGS_length1 = 4;
-#line 8839 "PhotoMetadata.c"
+#line 8837 "PhotoMetadata.c"
 }
 
 
@@ -8859,7 +8857,7 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
 	_tmp1_ = g_strdup ("<uninitialized>");
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp1_;
-#line 8858 "PhotoMetadata.c"
+#line 8856 "PhotoMetadata.c"
 }
 
 
@@ -8868,14 +8866,14 @@ static void photo_metadata_finalize (MediaMetadata* obj) {
 #line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata);
 #line 135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_gexiv2_metadata_free0 (self->priv->exiv2);
+	_g_object_unref0 (self->priv->exiv2);
 #line 136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
 #line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 8874 "PhotoMetadata.c"
+#line 8872 "PhotoMetadata.c"
 }
 
 
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index a99e0c1..a410499 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -103,7 +103,7 @@ public class PhotoMetadata : MediaMetadata {
         AT_LEAST_DEFAULT_DOMAIN
     }
     
-    private const PrepareInputTextOptions PREPARE_STRING_OPTIONS =
+    public const PrepareInputTextOptions PREPARE_STRING_OPTIONS =
         PrepareInputTextOptions.INVALID_IS_NULL
         | PrepareInputTextOptions.EMPTY_IS_NULL
         | PrepareInputTextOptions.STRIP
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index 434f905..2395165 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.32.1, the Vala compiler
+/* Photos.c generated by valac 0.34.1, the Vala compiler
  * generated from Photos.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 98d4cd2..11ca7ab 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.32.1, the Vala compiler
+/* PngSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1020,7 +1020,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp4__length1 = file_lead_sequence_length1;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index e06b1d5..14d1fbe 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.32.1, the Vala compiler
+/* RawSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 2e1282e..9cc1094 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.32.1, the Vala compiler
+/* TiffSupport.c generated by valac 0.34.1, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1601,7 +1601,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 1602 "TiffSupport.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	dins = _tmp3_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-10-19 05:09:43 +0200
commit	694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
tree	c098b2104f1b76db60dd1f50de060c4439437fd8 /src/photos
parent	6824050190585821a13ce0f52d314986a25d6c2a (diff)
parent	b076314018e4b53d745823754a26eb6fb73a2801 (diff)