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/Tombstone.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/Tombstone.c') diff --git a/src/Tombstone.c b/src/Tombstone.c index 2107053..d660e10 100644 --- a/src/Tombstone.c +++ b/src/Tombstone.c @@ -1,4 +1,4 @@ -/* Tombstone.c generated by valac 0.34.4, the Vala compiler +/* Tombstone.c generated by valac 0.34.7, the Vala compiler * generated from Tombstone.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1890,11 +1890,11 @@ static void tombstone_source_collection_class_init (TombstoneSourceCollectionCla #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" g_type_class_add_private (klass, sizeof (TombstoneSourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = tombstone_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) tombstone_source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataCollectionClass *) klass)->notify_contents_altered = tombstone_source_collection_real_notify_contents_altered; + ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) tombstone_source_collection_real_notify_contents_altered; #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataCollectionClass *) klass)->notify_items_altered = tombstone_source_collection_real_notify_items_altered; + ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tombstone_source_collection_real_notify_items_altered; #line 1898 "Tombstone.c" } @@ -1904,7 +1904,7 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (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); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_TOMBSTONE, (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 8 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file_map = _tmp0_; #line 1910 "Tombstone.c" @@ -2452,7 +2452,7 @@ void tombstone_init (void) { GeeCollection* _tmp19_ = NULL; GeeCollection* _tmp20_ = NULL; #line 217 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp10_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp10_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 217 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstones = _tmp10_; #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2542,7 +2542,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, tombstoned_file_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala" files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 2548 "Tombstone.c" @@ -2800,7 +2800,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala" source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, FALSE, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala" tombstones = _tmp17_; #line 2806 "Tombstone.c" @@ -3508,15 +3508,15 @@ static void tombstone_class_init (TombstoneClass * klass) { #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" g_type_class_add_private (klass, sizeof (TombstonePrivate)); #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataSourceClass *) klass)->get_typename = tombstone_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) tombstone_real_get_typename; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataSourceClass *) klass)->get_instance_id = tombstone_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) tombstone_real_get_instance_id; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataObjectClass *) klass)->get_name = tombstone_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) tombstone_real_get_name; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataObjectClass *) klass)->to_string = tombstone_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) tombstone_real_to_string; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" - ((DataSourceClass *) klass)->destroy = tombstone_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) tombstone_real_destroy; #line 174 "/home/jens/Source/shotwell/src/Tombstone.vala" G_OBJECT_CLASS (klass)->finalize = tombstone_finalize; #line 3522 "Tombstone.c" -- cgit v1.2.3