From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/photos/PhotoFileFormat.c | 226 ++++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 112 deletions(-) (limited to 'src/photos/PhotoFileFormat.c') diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index 24f6bd3..f34e451 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -1,4 +1,4 @@ -/* PhotoFileFormat.c generated by valac 0.34.4, the Vala compiler +/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler * generated from PhotoFileFormat.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2319,11 +2319,12 @@ PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver* static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) { + gboolean _tmp0_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_image'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - return FALSE; -#line 2327 "PhotoFileFormat.c" + return _tmp0_; +#line 2328 "PhotoFileFormat.c" } @@ -2332,16 +2333,17 @@ gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self) g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_image (self); -#line 2336 "PhotoFileFormat.c" +#line 2337 "PhotoFileFormat.c" } static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) { + gboolean _tmp0_ = FALSE; #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - return FALSE; -#line 2345 "PhotoFileFormat.c" + return _tmp0_; +#line 2347 "PhotoFileFormat.c" } @@ -2350,7 +2352,7 @@ gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* sel g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_metadata (self); -#line 2354 "PhotoFileFormat.c" +#line 2356 "PhotoFileFormat.c" } @@ -2359,7 +2361,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2363 "PhotoFileFormat.c" +#line 2365 "PhotoFileFormat.c" } @@ -2368,7 +2370,7 @@ PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_writer (self, filepath); -#line 2372 "PhotoFileFormat.c" +#line 2374 "PhotoFileFormat.c" } @@ -2377,7 +2379,7 @@ static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_wr g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2381 "PhotoFileFormat.c" +#line 2383 "PhotoFileFormat.c" } @@ -2386,7 +2388,7 @@ PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoF g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata_writer (self, filepath); -#line 2390 "PhotoFileFormat.c" +#line 2392 "PhotoFileFormat.c" } @@ -2395,7 +2397,7 @@ static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFile g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_sniffer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2399 "PhotoFileFormat.c" +#line 2401 "PhotoFileFormat.c" } @@ -2404,7 +2406,7 @@ PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_sniffer (self, file, options); -#line 2408 "PhotoFileFormat.c" +#line 2410 "PhotoFileFormat.c" } @@ -2414,14 +2416,14 @@ PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type) { self = (PhotoFileFormatDriver*) g_type_create_instance (object_type); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2418 "PhotoFileFormat.c" +#line 2420 "PhotoFileFormat.c" } static void value_photo_file_format_driver_init (GValue* value) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2425 "PhotoFileFormat.c" +#line 2427 "PhotoFileFormat.c" } @@ -2430,7 +2432,7 @@ static void value_photo_file_format_driver_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (value->data[0].v_pointer); -#line 2434 "PhotoFileFormat.c" +#line 2436 "PhotoFileFormat.c" } } @@ -2440,11 +2442,11 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_driver_ref (src_value->data[0].v_pointer); -#line 2444 "PhotoFileFormat.c" +#line 2446 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 2448 "PhotoFileFormat.c" +#line 2450 "PhotoFileFormat.c" } } @@ -2452,37 +2454,37 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value, static gpointer value_photo_file_format_driver_peek_pointer (const GValue* value) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2456 "PhotoFileFormat.c" +#line 2458 "PhotoFileFormat.c" } static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 2463 "PhotoFileFormat.c" +#line 2465 "PhotoFileFormat.c" PhotoFileFormatDriver* object; object = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2470 "PhotoFileFormat.c" +#line 2472 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 2474 "PhotoFileFormat.c" +#line 2476 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_driver_ref (object); -#line 2478 "PhotoFileFormat.c" +#line 2480 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2482 "PhotoFileFormat.c" +#line 2484 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2486 "PhotoFileFormat.c" +#line 2488 "PhotoFileFormat.c" } @@ -2493,25 +2495,25 @@ static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, g if (!object_p) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2497 "PhotoFileFormat.c" +#line 2499 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 2503 "PhotoFileFormat.c" +#line 2505 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 2507 "PhotoFileFormat.c" +#line 2509 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2511 "PhotoFileFormat.c" +#line 2513 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2515 "PhotoFileFormat.c" +#line 2517 "PhotoFileFormat.c" } @@ -2525,7 +2527,7 @@ GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 2529 "PhotoFileFormat.c" +#line 2531 "PhotoFileFormat.c" } @@ -2534,7 +2536,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2538 "PhotoFileFormat.c" +#line 2540 "PhotoFileFormat.c" } @@ -2554,17 +2556,17 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2558 "PhotoFileFormat.c" +#line 2560 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2562 "PhotoFileFormat.c" +#line 2564 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2568 "PhotoFileFormat.c" +#line 2570 "PhotoFileFormat.c" } } @@ -2583,17 +2585,17 @@ void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 2587 "PhotoFileFormat.c" +#line 2589 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2591 "PhotoFileFormat.c" +#line 2593 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2597 "PhotoFileFormat.c" +#line 2599 "PhotoFileFormat.c" } } @@ -2604,29 +2606,29 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = photo_file_format_driver_finalize; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = photo_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_get_properties; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = photo_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_reader; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = photo_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_create_metadata; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = photo_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_image; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = photo_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_metadata; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = photo_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = photo_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_metadata_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = photo_file_format_driver_real_create_sniffer; -#line 2623 "PhotoFileFormat.c" + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer; +#line 2625 "PhotoFileFormat.c" } static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 2630 "PhotoFileFormat.c" +#line 2632 "PhotoFileFormat.c" } @@ -2636,7 +2638,7 @@ static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 2640 "PhotoFileFormat.c" +#line 2642 "PhotoFileFormat.c" } @@ -2661,7 +2663,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 2665 "PhotoFileFormat.c" +#line 2667 "PhotoFileFormat.c" } @@ -2674,7 +2676,7 @@ void photo_file_format_driver_unref (gpointer instance) { PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->finalize (self); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2678 "PhotoFileFormat.c" +#line 2680 "PhotoFileFormat.c" } } @@ -2696,7 +2698,7 @@ static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoF g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_file_format'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2700 "PhotoFileFormat.c" +#line 2702 "PhotoFileFormat.c" } @@ -2705,7 +2707,7 @@ PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatPro g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_file_format (self); -#line 2709 "PhotoFileFormat.c" +#line 2711 "PhotoFileFormat.c" } @@ -2714,7 +2716,7 @@ static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFi g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_flags'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2718 "PhotoFileFormat.c" +#line 2720 "PhotoFileFormat.c" } @@ -2723,7 +2725,7 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_flags (self); -#line 2727 "PhotoFileFormat.c" +#line 2729 "PhotoFileFormat.c" } @@ -2756,7 +2758,7 @@ static gboolean photo_file_format_properties_real_is_recognized_extension (Photo result = _tmp5_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2760 "PhotoFileFormat.c" +#line 2762 "PhotoFileFormat.c" } @@ -2765,7 +2767,7 @@ gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatPr g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), FALSE); #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->is_recognized_extension (self, ext); -#line 2769 "PhotoFileFormat.c" +#line 2771 "PhotoFileFormat.c" } @@ -2774,7 +2776,7 @@ static gchar* photo_file_format_properties_real_get_default_extension (PhotoFile g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_extension'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2778 "PhotoFileFormat.c" +#line 2780 "PhotoFileFormat.c" } @@ -2783,7 +2785,7 @@ gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProper g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_extension (self); -#line 2787 "PhotoFileFormat.c" +#line 2789 "PhotoFileFormat.c" } @@ -2792,7 +2794,7 @@ static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFile g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_known_extensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2796 "PhotoFileFormat.c" +#line 2798 "PhotoFileFormat.c" } @@ -2801,7 +2803,7 @@ gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProper g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_known_extensions (self, result_length1); -#line 2805 "PhotoFileFormat.c" +#line 2807 "PhotoFileFormat.c" } @@ -2810,7 +2812,7 @@ static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFile g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_mime_type'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2814 "PhotoFileFormat.c" +#line 2816 "PhotoFileFormat.c" } @@ -2819,7 +2821,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_mime_type (self); -#line 2823 "PhotoFileFormat.c" +#line 2825 "PhotoFileFormat.c" } @@ -2828,7 +2830,7 @@ static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormat g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_mime_types'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2832 "PhotoFileFormat.c" +#line 2834 "PhotoFileFormat.c" } @@ -2837,7 +2839,7 @@ gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_mime_types (self, result_length1); -#line 2841 "PhotoFileFormat.c" +#line 2843 "PhotoFileFormat.c" } @@ -2846,7 +2848,7 @@ static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFile g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_user_visible_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2850 "PhotoFileFormat.c" +#line 2852 "PhotoFileFormat.c" } @@ -2855,14 +2857,14 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_user_visible_name (self); -#line 2859 "PhotoFileFormat.c" +#line 2861 "PhotoFileFormat.c" } static gpointer _g_object_ref0 (gpointer self) { #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self ? g_object_ref (self) : NULL; -#line 2866 "PhotoFileFormat.c" +#line 2868 "PhotoFileFormat.c" } @@ -2913,7 +2915,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope _tmp6_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp6_ != NULL) { -#line 2917 "PhotoFileFormat.c" +#line 2919 "PhotoFileFormat.c" const gchar* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2922,15 +2924,15 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope _tmp8_ = photo_file_format_properties_is_recognized_extension (self, _tmp7_); #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp5_ = _tmp8_; -#line 2926 "PhotoFileFormat.c" +#line 2928 "PhotoFileFormat.c" } else { #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp5_ = FALSE; -#line 2930 "PhotoFileFormat.c" +#line 2932 "PhotoFileFormat.c" } #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp5_) { -#line 2934 "PhotoFileFormat.c" +#line 2936 "PhotoFileFormat.c" GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2945,7 +2947,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2949 "PhotoFileFormat.c" +#line 2951 "PhotoFileFormat.c" } #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp11_ = file; @@ -2981,7 +2983,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2985 "PhotoFileFormat.c" +#line 2987 "PhotoFileFormat.c" } @@ -2991,14 +2993,14 @@ PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_ self = (PhotoFileFormatProperties*) g_type_create_instance (object_type); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2995 "PhotoFileFormat.c" +#line 2997 "PhotoFileFormat.c" } static void value_photo_file_format_properties_init (GValue* value) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3002 "PhotoFileFormat.c" +#line 3004 "PhotoFileFormat.c" } @@ -3007,7 +3009,7 @@ static void value_photo_file_format_properties_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (value->data[0].v_pointer); -#line 3011 "PhotoFileFormat.c" +#line 3013 "PhotoFileFormat.c" } } @@ -3017,11 +3019,11 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val if (src_value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_properties_ref (src_value->data[0].v_pointer); -#line 3021 "PhotoFileFormat.c" +#line 3023 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 3025 "PhotoFileFormat.c" +#line 3027 "PhotoFileFormat.c" } } @@ -3029,37 +3031,37 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val static gpointer value_photo_file_format_properties_peek_pointer (const GValue* value) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3033 "PhotoFileFormat.c" +#line 3035 "PhotoFileFormat.c" } static gchar* value_photo_file_format_properties_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 3040 "PhotoFileFormat.c" +#line 3042 "PhotoFileFormat.c" PhotoFileFormatProperties* object; object = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3047 "PhotoFileFormat.c" +#line 3049 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 3051 "PhotoFileFormat.c" +#line 3053 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_properties_ref (object); -#line 3055 "PhotoFileFormat.c" +#line 3057 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3059 "PhotoFileFormat.c" +#line 3061 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3063 "PhotoFileFormat.c" +#line 3065 "PhotoFileFormat.c" } @@ -3070,25 +3072,25 @@ static gchar* value_photo_file_format_properties_lcopy_value (const GValue* valu if (!object_p) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3074 "PhotoFileFormat.c" +#line 3076 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 3080 "PhotoFileFormat.c" +#line 3082 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 3084 "PhotoFileFormat.c" +#line 3086 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3088 "PhotoFileFormat.c" +#line 3090 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3092 "PhotoFileFormat.c" +#line 3094 "PhotoFileFormat.c" } @@ -3102,7 +3104,7 @@ GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 3106 "PhotoFileFormat.c" +#line 3108 "PhotoFileFormat.c" } @@ -3111,7 +3113,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3115 "PhotoFileFormat.c" +#line 3117 "PhotoFileFormat.c" } @@ -3131,17 +3133,17 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3135 "PhotoFileFormat.c" +#line 3137 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3139 "PhotoFileFormat.c" +#line 3141 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3145 "PhotoFileFormat.c" +#line 3147 "PhotoFileFormat.c" } } @@ -3160,17 +3162,17 @@ void value_take_photo_file_format_properties (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 3164 "PhotoFileFormat.c" +#line 3166 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3168 "PhotoFileFormat.c" +#line 3170 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3174 "PhotoFileFormat.c" +#line 3176 "PhotoFileFormat.c" } } @@ -3181,29 +3183,29 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = photo_file_format_properties_finalize; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = photo_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_file_format; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = photo_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_flags; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = photo_file_format_properties_real_is_recognized_extension; + ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*)(PhotoFileFormatProperties*, const gchar*)) photo_file_format_properties_real_is_recognized_extension; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = photo_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_extension; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = photo_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_known_extensions; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = photo_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_mime_type; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = photo_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_mime_types; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = photo_file_format_properties_real_get_user_visible_name; -#line 3200 "PhotoFileFormat.c" + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name; +#line 3202 "PhotoFileFormat.c" } static void photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 3207 "PhotoFileFormat.c" +#line 3209 "PhotoFileFormat.c" } @@ -3213,7 +3215,7 @@ static void photo_file_format_properties_finalize (PhotoFileFormatProperties* ob self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 3217 "PhotoFileFormat.c" +#line 3219 "PhotoFileFormat.c" } @@ -3238,7 +3240,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 3242 "PhotoFileFormat.c" +#line 3244 "PhotoFileFormat.c" } @@ -3251,7 +3253,7 @@ void photo_file_format_properties_unref (gpointer instance) { PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->finalize (self); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3255 "PhotoFileFormat.c" +#line 3257 "PhotoFileFormat.c" } } -- cgit v1.2.3