Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 20 insertions, 20 deletions

diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 1b0d4b8..8e23487 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.4, the Vala compiler
+/* RawSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -848,21 +848,21 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->finalize = raw_file_format_driver_finalize;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->get_properties = raw_file_format_driver_real_get_properties;
+	((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_get_properties;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_reader = raw_file_format_driver_real_create_reader;
+	((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_reader;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata = raw_file_format_driver_real_create_metadata;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_create_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_image = raw_file_format_driver_real_can_write_image;
+	((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_image;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = raw_file_format_driver_real_can_write_metadata;
+	((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_metadata;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_writer = raw_file_format_driver_real_create_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = raw_file_format_driver_real_create_metadata_writer;
+	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatDriverClass *) klass)->create_sniffer = raw_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
 #line 867 "RawSupport.c"
 }
 
@@ -1242,19 +1242,19 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatPropertiesClass *) klass)->finalize = raw_file_format_properties_finalize;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = raw_file_format_properties_real_get_file_format;
+	((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_file_format;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = raw_file_format_properties_real_get_user_visible_name;
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_user_visible_name;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_flags = raw_file_format_properties_real_get_flags;
+	((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_flags;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = raw_file_format_properties_real_get_default_extension;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_extension;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = raw_file_format_properties_real_get_known_extensions;
+	((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_known_extensions;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = raw_file_format_properties_real_get_default_mime_type;
+	((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_mime_type;
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = raw_file_format_properties_real_get_mime_types;
+	((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_mime_types;
 #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_strdup ("3fr");
 #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2206,7 +2206,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileSnifferClass *) klass)->sniff = raw_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff;
 #line 2211 "RawSupport.c"
 }
 
@@ -2696,11 +2696,11 @@ static void raw_reader_class_init (RawReaderClass * klass) {
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_reader_parent_class = g_type_class_peek_parent (klass);
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->read_metadata = raw_reader_real_read_metadata;
+	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) raw_reader_real_read_metadata;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->unscaled_read = raw_reader_real_unscaled_read;
+	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) raw_reader_real_unscaled_read;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	((PhotoFileReaderClass *) klass)->scaled_read = raw_reader_real_scaled_read;
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
 #line 2705 "RawSupport.c"
 }