Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 117 insertions, 113 deletions

diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 3229f52..20e79a9 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.4, the Vala compiler
+/* PngSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -888,19 +888,19 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = png_file_format_properties_finalize;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = png_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_file_format;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = png_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_flags;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = png_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_user_visible_name;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = png_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_extension;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = png_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_known_extensions;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = png_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_mime_type;
 #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = png_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_mime_types;
 #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0_ = g_strdup ("png");
 #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -982,12 +982,12 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	GFile* _tmp0_ = NULL;
 	GFileInputStream* _tmp1_ = NULL;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp2_ = NULL;
+	guint8* _tmp3_ = NULL;
 	gint file_lead_sequence_length1 = 0;
 	gint _file_lead_sequence_size_ = 0;
-	GFileInputStream* _tmp3_ = NULL;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	GFileInputStream* _tmp4_ = NULL;
+	guint8* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -999,30 +999,34 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	instream = _tmp1_;
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1003 "PngSupport.c"
+		gboolean _tmp2_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-		return FALSE;
-#line 1007 "PngSupport.c"
+		return _tmp2_;
+#line 1009 "PngSupport.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
+	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	file_lead_sequence = _tmp2_;
+	file_lead_sequence = _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	file_lead_sequence_length1 = G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE);
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_file_lead_sequence_size_ = file_lead_sequence_length1;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp3_ = instream;
+	_tmp4_ = instream;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp4_ = file_lead_sequence;
+	_tmp5_ = file_lead_sequence;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp4__length1 = file_lead_sequence_length1;
+	_tmp5__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 (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1029 "PngSupport.c"
+		gboolean _tmp6_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1030,62 +1034,62 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (instream);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-		return FALSE;
-#line 1035 "PngSupport.c"
+		return _tmp6_;
+#line 1039 "PngSupport.c"
 	}
 	{
 		gint i = 0;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		i = 0;
-#line 1041 "PngSupport.c"
+#line 1045 "PngSupport.c"
 		{
-			gboolean _tmp5_ = FALSE;
+			gboolean _tmp7_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-			_tmp5_ = TRUE;
+			_tmp7_ = TRUE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			while (TRUE) {
-#line 1048 "PngSupport.c"
-				gint _tmp7_ = 0;
-				guint8* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
+#line 1052 "PngSupport.c"
 				gint _tmp9_ = 0;
-				guint8 _tmp10_ = 0U;
+				guint8* _tmp10_ = NULL;
+				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
 				guint8 _tmp12_ = 0U;
+				gint _tmp13_ = 0;
+				guint8 _tmp14_ = 0U;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (!_tmp5_) {
-#line 1058 "PngSupport.c"
-					gint _tmp6_ = 0;
+				if (!_tmp7_) {
+#line 1062 "PngSupport.c"
+					gint _tmp8_ = 0;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-					_tmp6_ = i;
+					_tmp8_ = i;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-					i = _tmp6_ + 1;
-#line 1064 "PngSupport.c"
+					i = _tmp8_ + 1;
+#line 1068 "PngSupport.c"
 				}
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp5_ = FALSE;
+				_tmp7_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp7_ = i;
+				_tmp9_ = i;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (!(_tmp7_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
+				if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					break;
-#line 1074 "PngSupport.c"
+#line 1078 "PngSupport.c"
 				}
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp8_ = file_lead_sequence;
+				_tmp10_ = file_lead_sequence;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp8__length1 = file_lead_sequence_length1;
+				_tmp10__length1 = file_lead_sequence_length1;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp9_ = i;
+				_tmp11_ = i;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp10_ = _tmp8_[_tmp9_];
+				_tmp12_ = _tmp10_[_tmp11_];
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp11_ = i;
+				_tmp13_ = i;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp12_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp11_];
+				_tmp14_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (_tmp10_ != _tmp12_) {
+				if (_tmp12_ != _tmp14_) {
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					result = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1094,7 +1098,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 					_g_object_unref0 (instream);
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					return result;
-#line 1098 "PngSupport.c"
+#line 1102 "PngSupport.c"
 				}
 			}
 		}
@@ -1107,14 +1111,14 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	_g_object_unref0 (instream);
 #line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1111 "PngSupport.c"
+#line 1115 "PngSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1118 "PngSupport.c"
+#line 1122 "PngSupport.c"
 }
 
 
@@ -1150,7 +1154,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		g_propagate_error (error, _inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return NULL;
-#line 1154 "PngSupport.c"
+#line 1158 "PngSupport.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (!_tmp0_) {
@@ -1160,11 +1164,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (is_corrupted) {
 #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1164 "PngSupport.c"
+#line 1168 "PngSupport.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1168 "PngSupport.c"
+#line 1172 "PngSupport.c"
 	}
 #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1178,7 +1182,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		g_propagate_error (error, _inner_error_);
 #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return NULL;
-#line 1182 "PngSupport.c"
+#line 1186 "PngSupport.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp5_ = detected;
@@ -1192,11 +1196,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (is_corrupted) {
 #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1196 "PngSupport.c"
+#line 1200 "PngSupport.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1200 "PngSupport.c"
+#line 1204 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp7_ = detected;
@@ -1204,17 +1208,17 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp8_ = _tmp7_->file_format;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) {
-#line 1208 "PngSupport.c"
+#line 1212 "PngSupport.c"
 		DetectedPhotoInformation* _tmp9_ = NULL;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp9_ = detected;
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1214 "PngSupport.c"
+#line 1218 "PngSupport.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp6_ = NULL;
-#line 1218 "PngSupport.c"
+#line 1222 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1226,11 +1230,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (is_corrupted) {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1230 "PngSupport.c"
+#line 1234 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1234 "PngSupport.c"
+#line 1238 "PngSupport.c"
 }
 
 
@@ -1238,8 +1242,8 @@ static void png_sniffer_class_init (PngSnifferClass * klass) {
 #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = png_sniffer_real_sniff;
-#line 1243 "PngSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) png_sniffer_real_sniff;
+#line 1247 "PngSupport.c"
 }
 
 
@@ -1270,14 +1274,14 @@ PngReader* png_reader_construct (GType object_type, const gchar* filepath) {
 	self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1274 "PngSupport.c"
+#line 1278 "PngSupport.c"
 }
 
 
 PngReader* png_reader_new (const gchar* filepath) {
 #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_reader_construct (TYPE_PNG_READER, filepath);
-#line 1281 "PngSupport.c"
+#line 1285 "PngSupport.c"
 }
 
 
@@ -1306,7 +1310,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	if (_tmp3_ > 9999) {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp1_ = TRUE;
-#line 1310 "PngSupport.c"
+#line 1314 "PngSupport.c"
 	} else {
 		Dimensions _tmp4_ = {0};
 		gint _tmp5_ = 0;
@@ -1316,11 +1320,11 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_tmp5_ = _tmp4_.height;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1320 "PngSupport.c"
+#line 1324 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp1_) {
-#line 1324 "PngSupport.c"
+#line 1328 "PngSupport.c"
 		gboolean _tmp6_ = FALSE;
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
@@ -1332,7 +1336,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		if (_tmp8_ < 100) {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp6_ = TRUE;
-#line 1336 "PngSupport.c"
+#line 1340 "PngSupport.c"
 		} else {
 			Dimensions _tmp9_ = {0};
 			gint _tmp10_ = 0;
@@ -1342,19 +1346,19 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_tmp10_ = _tmp9_.height;
 #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1346 "PngSupport.c"
+#line 1350 "PngSupport.c"
 		}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1350 "PngSupport.c"
+#line 1354 "PngSupport.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = FALSE;
-#line 1354 "PngSupport.c"
+#line 1358 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp0_) {
-#line 1358 "PngSupport.c"
+#line 1362 "PngSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
@@ -1405,7 +1409,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_g_object_unref0 (_result_);
 #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			return NULL;
-#line 1409 "PngSupport.c"
+#line 1413 "PngSupport.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1433,7 +1437,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_result_ = _tmp27_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1437 "PngSupport.c"
+#line 1441 "PngSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
@@ -1473,7 +1477,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_g_object_unref0 (_result_);
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			return NULL;
-#line 1477 "PngSupport.c"
+#line 1481 "PngSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1485,13 +1489,13 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_result_ = _tmp37_;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (_tmp28_);
-#line 1489 "PngSupport.c"
+#line 1493 "PngSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	result = _result_;
 #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1495 "PngSupport.c"
+#line 1499 "PngSupport.c"
 }
 
 
@@ -1499,8 +1503,8 @@ static void png_reader_class_init (PngReaderClass * klass) {
 #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_reader_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = png_reader_real_scaled_read;
-#line 1504 "PngSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read;
+#line 1508 "PngSupport.c"
 }
 
 
@@ -1531,14 +1535,14 @@ PngWriter* png_writer_construct (GType object_type, const gchar* filepath) {
 	self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1535 "PngSupport.c"
+#line 1539 "PngSupport.c"
 }
 
 
 PngWriter* png_writer_new (const gchar* filepath) {
 #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_writer_construct (TYPE_PNG_WRITER, filepath);
-#line 1542 "PngSupport.c"
+#line 1546 "PngSupport.c"
 }
 
 
@@ -1568,7 +1572,7 @@ static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jpe
 		g_propagate_error (error, _inner_error_);
 #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return;
-#line 1572 "PngSupport.c"
+#line 1576 "PngSupport.c"
 	}
 }
 
@@ -1577,8 +1581,8 @@ static void png_writer_class_init (PngWriterClass * klass) {
 #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_writer_parent_class = g_type_class_peek_parent (klass);
 #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileWriterClass *) klass)->write = png_writer_real_write;
-#line 1582 "PngSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write;
+#line 1586 "PngSupport.c"
 }
 
 
@@ -1609,14 +1613,14 @@ PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar
 	self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
 #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1613 "PngSupport.c"
+#line 1617 "PngSupport.c"
 }
 
 
 PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) {
 #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath);
-#line 1620 "PngSupport.c"
+#line 1624 "PngSupport.c"
 }
 
 
@@ -1646,7 +1650,7 @@ static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* ba
 		g_propagate_error (error, _inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return;
-#line 1650 "PngSupport.c"
+#line 1654 "PngSupport.c"
 	}
 }
 
@@ -1655,8 +1659,8 @@ static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) {
 #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileMetadataWriterClass *) klass)->write_metadata = png_metadata_writer_real_write_metadata;
-#line 1660 "PngSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata;
+#line 1664 "PngSupport.c"
 }
 
 
@@ -1686,14 +1690,14 @@ void png_file_format_driver_init (void) {
 	png_file_format_driver_instance = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	png_file_format_properties_init ();
-#line 1690 "PngSupport.c"
+#line 1694 "PngSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1697 "PngSupport.c"
+#line 1701 "PngSupport.c"
 }
 
 
@@ -1709,7 +1713,7 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1713 "PngSupport.c"
+#line 1717 "PngSupport.c"
 }
 
 
@@ -1725,7 +1729,7 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1729 "PngSupport.c"
+#line 1733 "PngSupport.c"
 }
 
 
@@ -1746,7 +1750,7 @@ static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1750 "PngSupport.c"
+#line 1754 "PngSupport.c"
 }
 
 
@@ -1759,7 +1763,7 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = TRUE;
 #line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1763 "PngSupport.c"
+#line 1767 "PngSupport.c"
 }
 
 
@@ -1772,7 +1776,7 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = TRUE;
 #line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1776 "PngSupport.c"
+#line 1780 "PngSupport.c"
 }
 
 
@@ -1793,7 +1797,7 @@ static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
 #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1797 "PngSupport.c"
+#line 1801 "PngSupport.c"
 }
 
 
@@ -1814,7 +1818,7 @@ static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writ
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
 #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1818 "PngSupport.c"
+#line 1822 "PngSupport.c"
 }
 
 
@@ -1838,7 +1842,7 @@ static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFo
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1842 "PngSupport.c"
+#line 1846 "PngSupport.c"
 }
 
 
@@ -1854,7 +1858,7 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1858 "PngSupport.c"
+#line 1862 "PngSupport.c"
 }
 
 
@@ -1864,14 +1868,14 @@ PngFileFormatDriver* png_file_format_driver_construct (GType object_type) {
 	self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return self;
-#line 1868 "PngSupport.c"
+#line 1872 "PngSupport.c"
 }
 
 
 PngFileFormatDriver* png_file_format_driver_new (void) {
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER);
-#line 1875 "PngSupport.c"
+#line 1879 "PngSupport.c"
 }
 
 
@@ -1881,22 +1885,22 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass)
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = png_file_format_driver_finalize;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = png_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_get_properties;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = png_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_reader;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = png_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_image;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = png_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_metadata;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = png_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_writer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = png_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_metadata_writer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = png_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer;
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = png_file_format_driver_real_create_metadata;
-#line 1900 "PngSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_create_metadata;
+#line 1904 "PngSupport.c"
 }
 
 
@@ -1910,7 +1914,7 @@ static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
 #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj);
-#line 1914 "PngSupport.c"
+#line 1918 "PngSupport.c"
 }