Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

12 files changed, 124 insertions, 124 deletions

diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 19b2226..11ad8c6 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.34.2, the Vala compiler
+/* BmpSupport.c generated by valac 0.32.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_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, 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 bbd7376..36e9c88 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.2, the Vala compiler
+/* GRaw.c generated by valac 0.32.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_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, 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 4f5a872..010572b 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.34.2, the Vala compiler
+/* GdkSupport.c generated by valac 0.32.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_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
+			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, 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_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, 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 0da9ce7..3c86a7a 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.34.2, the Vala compiler
+/* JfifSupport.c generated by valac 0.32.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_input_stream_get_type (), GInputStream));
+	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, 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 19038b8..2f05603 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.32.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 a033e19..6e05342 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.32.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 161349e..8d44d6b 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.32.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 def6140..148df86 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.34.2, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2058,7 +2058,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6719,19 +6719,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6732 "PhotoMetadata.c"
 }
@@ -6741,17 +6741,17 @@ 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.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6752 "PhotoMetadata.c"
 }
@@ -7296,11 +7296,11 @@ static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 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.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 7301 "PhotoMetadata.c"
 	{
@@ -7315,73 +7315,73 @@ 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.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7332 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/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.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7341 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/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.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7357 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/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.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7368 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7382 "PhotoMetadata.c"
 	}
@@ -7389,24 +7389,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch25_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 7396 "PhotoMetadata.c"
 	}
 	__finally25:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/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.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 7407 "PhotoMetadata.c"
 	}
@@ -7420,37 +7420,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 7431 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7439 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7451 "PhotoMetadata.c"
 	}
@@ -7470,112 +7470,112 @@ 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.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 7475 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 7481 "PhotoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 7485 "PhotoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 7489 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 7501 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 7511 "PhotoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 7517 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 7531 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 7541 "PhotoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 7547 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 7556 "PhotoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 7576 "PhotoMetadata.c"
 }
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index ee58ad3..434f905 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.34.2, the Vala compiler
+/* Photos.c generated by valac 0.32.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 d3cb5c8..98d4cd2 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.2, the Vala compiler
+/* PngSupport.c generated by valac 0.32.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_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, 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 6a65390..f46b61e 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.2, the Vala compiler
+/* RawSupport.c generated by valac 0.32.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 74004f3..2e1282e 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.2, the Vala compiler
+/* TiffSupport.c generated by valac 0.32.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_input_stream_get_type (), GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	dins = _tmp3_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"