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/direct/DirectPhoto.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/direct/DirectPhoto.c') diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 369ddae..5347674 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler +/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1825,33 +1825,33 @@ static void direct_photo_class_init (DirectPhotoClass * klass) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_type_class_add_private (klass, sizeof (DirectPhotoPrivate)); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->get_preview_pixbuf = direct_photo_real_get_preview_pixbuf; + ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->rotate = direct_photo_real_rotate; + ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) direct_photo_real_rotate; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoSourceClass *) klass)->get_pixbuf = direct_photo_real_get_pixbuf; + ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) direct_photo_real_get_pixbuf; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = direct_photo_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) direct_photo_real_get_thumbnail; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataObjectClass *) klass)->notify_altered = direct_photo_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) direct_photo_real_notify_altered; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->has_user_generated_metadata = direct_photo_real_has_user_generated_metadata; + ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) direct_photo_real_has_user_generated_metadata; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->set_user_metadata_for_export = direct_photo_real_set_user_metadata_for_export; + ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->apply_user_metadata_for_reimport = direct_photo_real_apply_user_metadata_for_reimport; + ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->is_trashed = direct_photo_real_is_trashed; + ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) direct_photo_real_is_trashed; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->is_offline = direct_photo_real_is_offline; + ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) direct_photo_real_is_offline; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->trash = direct_photo_real_trash; + ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) direct_photo_real_trash; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->untrash = direct_photo_real_untrash; + ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) direct_photo_real_untrash; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->mark_offline = direct_photo_real_mark_offline; + ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) direct_photo_real_mark_offline; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->mark_online = direct_photo_real_mark_online; + ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) direct_photo_real_mark_online; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2772,11 +2772,11 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_type_class_add_private (klass, sizeof (DirectPhotoSourceCollectionPrivate)); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = direct_photo_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) direct_photo_source_collection_real_holds_type_of_source; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataCollectionClass *) klass)->notify_items_added = direct_photo_source_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_added; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataCollectionClass *) klass)->notify_items_removed = direct_photo_source_collection_real_notify_items_removed; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed; #line 2781 "DirectPhoto.c" } @@ -2787,11 +2787,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv = DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self); #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; #line 2798 "DirectPhoto.c" -- cgit v1.2.3