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/Tag.c | 102 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'src/Tag.c') diff --git a/src/Tag.c b/src/Tag.c index 9545f23..000dd2d 100644 --- a/src/Tag.c +++ b/src/Tag.c @@ -1,4 +1,4 @@ -/* Tag.c generated by valac 0.34.4, the Vala compiler +/* Tag.c generated by valac 0.34.7, the Vala compiler * generated from Tag.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1552,7 +1552,7 @@ GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) { #line 91 "/home/jens/Source/shotwell/src/Tag.vala" _tmp0_ = self->priv->name_map; #line 91 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 91 "/home/jens/Source/shotwell/src/Tag.vala" _tmp2_ = _tmp1_; #line 91 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2480,7 +2480,7 @@ static void tag_source_collection_real_notify_container_contents_added (Containe MediaSource* _tmp16_ = NULL; GeeList* _tmp17_ = NULL; #line 215 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp14_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp14_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 215 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (tags); #line 215 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2525,7 +2525,7 @@ static void tag_source_collection_real_notify_container_contents_added (Containe MediaSource* _tmp28_ = NULL; GeeSortedSet* _tmp29_ = NULL; #line 224 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp26_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); + _tmp26_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL); #line 224 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (sorted_tags); #line 224 "/home/jens/Source/shotwell/src/Tag.vala" @@ -2802,21 +2802,21 @@ static void tag_source_collection_class_init (TagSourceCollectionClass * klass) #line 7 "/home/jens/Source/shotwell/src/Tag.vala" g_type_class_add_private (klass, sizeof (TagSourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = tag_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) tag_source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = tag_source_collection_real_get_containers_holding_source; + ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) tag_source_collection_real_get_containers_holding_source; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = tag_source_collection_real_convert_backlink_to_container; + ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) tag_source_collection_real_convert_backlink_to_container; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataCollectionClass *) klass)->notify_items_added = tag_source_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) tag_source_collection_real_notify_items_added; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataCollectionClass *) klass)->notify_items_removed = tag_source_collection_real_notify_items_removed; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) tag_source_collection_real_notify_items_removed; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataCollectionClass *) klass)->notify_items_altered = tag_source_collection_real_notify_items_altered; + ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tag_source_collection_real_notify_items_altered; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = tag_source_collection_real_notify_container_contents_added; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_added; #line 7 "/home/jens/Source/shotwell/src/Tag.vala" - ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = tag_source_collection_real_notify_container_contents_removed; + ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) tag_source_collection_real_notify_container_contents_removed; #line 2821 "Tag.c" } @@ -2828,15 +2828,15 @@ static void tag_source_collection_instance_init (TagSourceCollection * self) { #line 7 "/home/jens/Source/shotwell/src/Tag.vala" self->priv = TAG_SOURCE_COLLECTION_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_hash_name_string_gee_hash_data_func, NULL, NULL, _tag_equal_name_strings_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_hash_name_string_gee_hash_data_func, NULL, NULL, _tag_equal_name_strings_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->name_map = _tmp0_; #line 10 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->source_map = _tmp1_; #line 12 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_SORTED_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SORTED_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 12 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->sorted_source_map = _tmp2_; #line 2843 "Tag.c" @@ -2960,11 +2960,11 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) { #line 338 "/home/jens/Source/shotwell/src/Tag.vala" _tmp3_->name = _tmp6_; #line 341 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 341 "/home/jens/Source/shotwell/src/Tag.vala" source_list = _tmp7_; #line 342 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp8_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 342 "/home/jens/Source/shotwell/src/Tag.vala" thumbnail_views = _tmp8_; #line 343 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3084,7 +3084,7 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) { #line 355 "/home/jens/Source/shotwell/src/Tag.vala" _tmp30_ = self->priv->row; #line 355 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp31_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp31_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 355 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (_tmp30_->source_id_list); #line 355 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3128,7 +3128,7 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) { #line 364 "/home/jens/Source/shotwell/src/Tag.vala" _tmp44_ = source_list; #line 364 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 364 "/home/jens/Source/shotwell/src/Tag.vala" _tmp46_ = _tmp45_; #line 364 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3295,11 +3295,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 3296 "Tag.c" } #line 404 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp8_ = gee_tree_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp8_ = gee_tree_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 404 "/home/jens/Source/shotwell/src/Tag.vala" ancestry_dictionary = _tmp8_; #line 406 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp9_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp9_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 406 "/home/jens/Source/shotwell/src/Tag.vala" unlinked = _tmp9_; #line 407 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3588,7 +3588,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { } } #line 440 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp54_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp54_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 440 "/home/jens/Source/shotwell/src/Tag.vala" victim_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_SET, GeeSet); #line 3595 "Tag.c" @@ -3603,7 +3603,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 445 "/home/jens/Source/shotwell/src/Tag.vala" _tmp55_ = ancestry_dictionary; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp56_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_MAP, GeeMap)); + _tmp56_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 445 "/home/jens/Source/shotwell/src/Tag.vala" _tmp57_ = _tmp56_; #line 445 "/home/jens/Source/shotwell/src/Tag.vala" @@ -3873,7 +3873,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 470 "/home/jens/Source/shotwell/src/Tag.vala" _tmp111_ = ancestry_dictionary; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp112_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_MAP, GeeMap)); + _tmp112_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 470 "/home/jens/Source/shotwell/src/Tag.vala" _tmp113_ = _tmp112_; #line 470 "/home/jens/Source/shotwell/src/Tag.vala" @@ -4185,7 +4185,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 516 "/home/jens/Source/shotwell/src/Tag.vala" _tmp172_ = ancestry_dictionary; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp173_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_MAP, GeeMap)); + _tmp173_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 516 "/home/jens/Source/shotwell/src/Tag.vala" _tmp174_ = _tmp173_; #line 516 "/home/jens/Source/shotwell/src/Tag.vala" @@ -4216,7 +4216,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) { #line 521 "/home/jens/Source/shotwell/src/Tag.vala" _tmp180_ = ancestry_dictionary; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp181_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_MAP, GeeMap)); + _tmp181_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 521 "/home/jens/Source/shotwell/src/Tag.vala" _tmp182_ = _tmp181_; #line 521 "/home/jens/Source/shotwell/src/Tag.vala" @@ -4652,7 +4652,7 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) { #line 573 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL); #line 574 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 574 "/home/jens/Source/shotwell/src/Tag.vala" result_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 4659 "Tag.c" @@ -4832,7 +4832,7 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) { #line 4833 "Tag.c" } #line 596 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp38_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp38_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 596 "/home/jens/Source/shotwell/src/Tag.vala" _result_ = _tmp38_; #line 4839 "Tag.c" @@ -5013,7 +5013,7 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) { #line 612 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_COLLECTION (tags), NULL); #line 613 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 613 "/home/jens/Source/shotwell/src/Tag.vala" seen_tags = _tmp0_; #line 614 "/home/jens/Source/shotwell/src/Tag.vala" @@ -5023,7 +5023,7 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) { #line 614 "/home/jens/Source/shotwell/src/Tag.vala" terminal_tags = _tmp2_; #line 615 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 615 "/home/jens/Source/shotwell/src/Tag.vala" sorted_tags = _tmp3_; #line 5030 "Tag.c" @@ -6317,11 +6317,11 @@ GeeList* tag_get_hierarchical_children (Tag* self) { #line 797 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (IS_TAG (self), NULL); #line 798 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 798 "/home/jens/Source/shotwell/src/Tag.vala" _result_ = _tmp0_; #line 799 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 799 "/home/jens/Source/shotwell/src/Tag.vala" result_reversed = _tmp1_; #line 802 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6345,7 +6345,7 @@ GeeList* tag_get_hierarchical_children (Tag* self) { #line 6346 "Tag.c" } #line 807 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 807 "/home/jens/Source/shotwell/src/Tag.vala" forward_sorted_paths = _tmp6_; #line 809 "/home/jens/Source/shotwell/src/Tag.vala" @@ -6502,7 +6502,7 @@ GeeList* tag_get_hierarchical_children (Tag* self) { #line 819 "/home/jens/Source/shotwell/src/Tag.vala" _tmp35_ = result_reversed; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 819 "/home/jens/Source/shotwell/src/Tag.vala" _tmp37_ = _tmp36_; #line 819 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7421,7 +7421,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) { #line 7422 "Tag.c" } #line 975 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp2_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 975 "/home/jens/Source/shotwell/src/Tag.vala" view_list = _tmp2_; #line 7428 "Tag.c" @@ -7503,7 +7503,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) { #line 981 "/home/jens/Source/shotwell/src/Tag.vala" _tmp17_ = view_list; #line 981 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 981 "/home/jens/Source/shotwell/src/Tag.vala" _tmp19_ = _tmp18_; #line 981 "/home/jens/Source/shotwell/src/Tag.vala" @@ -7586,7 +7586,7 @@ GeeList* tag_detach (Tag* self, MediaSource* source) { #line 7587 "Tag.c" } #line 996 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 996 "/home/jens/Source/shotwell/src/Tag.vala" detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); #line 7593 "Tag.c" @@ -7757,7 +7757,7 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) { #line 1015 "/home/jens/Source/shotwell/src/Tag.vala" g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL); #line 1016 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 1016 "/home/jens/Source/shotwell/src/Tag.vala" detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 1018 "/home/jens/Source/shotwell/src/Tag.vala" @@ -8735,7 +8735,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, #line 8736 "Tag.c" GeeArrayList* _tmp1_ = NULL; #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (added_sources); #line 1122 "/home/jens/Source/shotwell/src/Tag.vala" @@ -8880,7 +8880,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added, #line 8881 "Tag.c" GeeArrayList* _tmp30_ = NULL; #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp30_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp30_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" _g_object_unref0 (removed_sources); #line 1140 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9199,7 +9199,7 @@ static void tag_real_destroy (DataSource* base) { #line 1180 "/home/jens/Source/shotwell/src/Tag.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self); #line 1182 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1182 "/home/jens/Source/shotwell/src/Tag.vala" removed = _tmp4_; #line 1183 "/home/jens/Source/shotwell/src/Tag.vala" @@ -9487,7 +9487,7 @@ static void tag_tag_snapshot_class_init (TagTagSnapshotClass * klass) { #line 274 "/home/jens/Source/shotwell/src/Tag.vala" g_type_class_add_private (klass, sizeof (TagTagSnapshotPrivate)); #line 274 "/home/jens/Source/shotwell/src/Tag.vala" - ((SourceSnapshotClass *) klass)->notify_broken = tag_tag_snapshot_real_notify_broken; + ((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) tag_tag_snapshot_real_notify_broken; #line 9492 "Tag.c" } @@ -9497,7 +9497,7 @@ static void tag_tag_snapshot_instance_init (TagTagSnapshot * self) { #line 274 "/home/jens/Source/shotwell/src/Tag.vala" self->priv = TAG_TAG_SNAPSHOT_GET_PRIVATE (self); #line 276 "/home/jens/Source/shotwell/src/Tag.vala" - _tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 276 "/home/jens/Source/shotwell/src/Tag.vala" self->priv->sources = _tmp0_; #line 9504 "Tag.c" @@ -9607,7 +9607,7 @@ static void tag_tag_proxy_class_init (TagTagProxyClass * klass) { #line 313 "/home/jens/Source/shotwell/src/Tag.vala" tag_tag_proxy_parent_class = g_type_class_peek_parent (klass); #line 313 "/home/jens/Source/shotwell/src/Tag.vala" - ((SourceProxyClass *) klass)->reconstitute = tag_tag_proxy_real_reconstitute; + ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) tag_tag_proxy_real_reconstitute; #line 9612 "Tag.c" } @@ -9634,19 +9634,19 @@ static void tag_class_init (TagClass * klass) { #line 269 "/home/jens/Source/shotwell/src/Tag.vala" g_type_class_add_private (klass, sizeof (TagPrivate)); #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataSourceClass *) klass)->get_typename = tag_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) tag_real_get_typename; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataSourceClass *) klass)->get_instance_id = tag_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) tag_real_get_instance_id; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataObjectClass *) klass)->get_name = tag_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) tag_real_get_name; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataObjectClass *) klass)->to_string = tag_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) tag_real_to_string; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataSourceClass *) klass)->equals = tag_real_equals; + ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) tag_real_equals; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataSourceClass *) klass)->save_snapshot = tag_real_save_snapshot; + ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) tag_real_save_snapshot; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" - ((DataSourceClass *) klass)->destroy = tag_real_destroy; + ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) tag_real_destroy; #line 269 "/home/jens/Source/shotwell/src/Tag.vala" G_OBJECT_CLASS (klass)->finalize = tag_finalize; #line 9653 "Tag.c" -- cgit v1.2.3