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/core/SourceCollection.c | 291 ++++++++++++++++++++++---------------------- 1 file changed, 147 insertions(+), 144 deletions(-) (limited to 'src/core/SourceCollection.c') diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index edda651..96c0bfd 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.34.4, the Vala compiler +/* SourceCollection.c generated by valac 0.34.7, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -341,11 +341,12 @@ SourceCollection* source_collection_construct (GType object_type, const gchar* n static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source) { + gboolean _tmp0_ = FALSE; #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("Type `%s' does not implement abstract method `source_collection_holds_type_of_source'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - return FALSE; -#line 349 "SourceCollection.c" + return _tmp0_; +#line 350 "SourceCollection.c" } @@ -354,7 +355,7 @@ gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSou g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->holds_type_of_source (self, source); -#line 358 "SourceCollection.c" +#line 359 "SourceCollection.c" } @@ -366,7 +367,7 @@ static void source_collection_real_notify_items_unlinking (SourceCollection* sel _tmp0_ = unlinking; #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "items-unlinking", _tmp0_); -#line 370 "SourceCollection.c" +#line 371 "SourceCollection.c" } @@ -375,7 +376,7 @@ void source_collection_notify_items_unlinking (SourceCollection* self, GeeCollec g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 56 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_unlinking (self, unlinking); -#line 379 "SourceCollection.c" +#line 380 "SourceCollection.c" } @@ -387,7 +388,7 @@ static void source_collection_real_notify_items_relinked (SourceCollection* self _tmp0_ = relinked; #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "items-relinked", _tmp0_); -#line 391 "SourceCollection.c" +#line 392 "SourceCollection.c" } @@ -396,7 +397,7 @@ void source_collection_notify_items_relinked (SourceCollection* self, GeeCollect g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 60 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_relinked (self, relinked); -#line 400 "SourceCollection.c" +#line 401 "SourceCollection.c" } @@ -408,7 +409,7 @@ static void source_collection_real_notify_item_destroyed (SourceCollection* self _tmp0_ = source; #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "item-destroyed", _tmp0_); -#line 412 "SourceCollection.c" +#line 413 "SourceCollection.c" } @@ -417,7 +418,7 @@ void source_collection_notify_item_destroyed (SourceCollection* self, DataSource g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 64 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_item_destroyed (self, source); -#line 421 "SourceCollection.c" +#line 422 "SourceCollection.c" } @@ -429,7 +430,7 @@ static void source_collection_real_notify_items_destroyed (SourceCollection* sel _tmp0_ = destroyed; #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "items-destroyed", _tmp0_); -#line 433 "SourceCollection.c" +#line 434 "SourceCollection.c" } @@ -438,7 +439,7 @@ void source_collection_notify_items_destroyed (SourceCollection* self, GeeCollec g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 68 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_items_destroyed (self, destroyed); -#line 442 "SourceCollection.c" +#line 443 "SourceCollection.c" } @@ -450,7 +451,7 @@ static void source_collection_real_notify_unlinked_destroyed (SourceCollection* _tmp0_ = unlinked; #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "unlinked-destroyed", _tmp0_); -#line 454 "SourceCollection.c" +#line 455 "SourceCollection.c" } @@ -459,7 +460,7 @@ void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSo g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 73 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_unlinked_destroyed (self, unlinked); -#line 463 "SourceCollection.c" +#line 464 "SourceCollection.c" } @@ -476,7 +477,7 @@ static void source_collection_real_notify_backlink_removed (SourceCollection* se _tmp1_ = sources; #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_emit_by_name (self, "backlink-removed", _tmp0_, _tmp1_); -#line 480 "SourceCollection.c" +#line 481 "SourceCollection.c" } @@ -485,7 +486,7 @@ void source_collection_notify_backlink_removed (SourceCollection* self, SourceBa g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 77 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_removed (self, backlink, sources); -#line 489 "SourceCollection.c" +#line 490 "SourceCollection.c" } @@ -503,7 +504,7 @@ static gboolean source_collection_real_valid_type (DataCollection* base, DataObj result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DATA_SOURCE); #line 83 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 507 "SourceCollection.c" +#line 508 "SourceCollection.c" } @@ -512,7 +513,7 @@ static gboolean _source_collection_destroy_and_delete_source_marked_action (Data result = source_collection_destroy_and_delete_source ((SourceCollection*) self, object, user); #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 516 "SourceCollection.c" +#line 517 "SourceCollection.c" } @@ -521,14 +522,14 @@ static gboolean _source_collection_destroy_source_marked_action (DataObject* obj result = source_collection_destroy_source ((SourceCollection*) self, object, user); #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 525 "SourceCollection.c" +#line 526 "SourceCollection.c" } static gpointer _g_object_ref0 (gpointer self) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self ? g_object_ref (self) : NULL; -#line 532 "SourceCollection.c" +#line 533 "SourceCollection.c" } @@ -571,7 +572,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp4_ = delete_backing; #line 92 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp4_) { -#line 575 "SourceCollection.c" +#line 576 "SourceCollection.c" Marker* _tmp5_ = NULL; ProgressMonitor _tmp6_ = NULL; void* _tmp6__target = NULL; @@ -586,7 +587,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp7_ = counter; #line 93 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_, _source_collection_destroy_and_delete_source_marked_action, self, _tmp6_, _tmp6__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject)); -#line 590 "SourceCollection.c" +#line 591 "SourceCollection.c" } else { Marker* _tmp8_ = NULL; ProgressMonitor _tmp9_ = NULL; @@ -602,7 +603,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp10_ = counter; #line 95 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp8_, _source_collection_destroy_source_marked_action, self, _tmp9_, _tmp9__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject)); -#line 606 "SourceCollection.c" +#line 607 "SourceCollection.c" } { GeeArrayList* _source_list = NULL; @@ -625,7 +626,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp14_ = _source_list; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp16_ = _tmp15_; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -634,7 +635,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _source_index = -1; #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 638 "SourceCollection.c" +#line 639 "SourceCollection.c" gint _tmp17_ = 0; gint _tmp18_ = 0; gint _tmp19_ = 0; @@ -655,7 +656,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g if (!(_tmp18_ < _tmp19_)) { #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 659 "SourceCollection.c" +#line 660 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = _source_list; @@ -671,11 +672,11 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g source_collection_notify_item_destroyed (self, _tmp23_); #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 675 "SourceCollection.c" +#line 676 "SourceCollection.c" } #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 679 "SourceCollection.c" +#line 680 "SourceCollection.c" } #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp24_ = counter; @@ -693,7 +694,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp28_ = not_removed; #line 105 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (NULL != _tmp28_) { -#line 697 "SourceCollection.c" +#line 698 "SourceCollection.c" GeeList* _tmp29_ = NULL; SourceCollectionDestroyCounter* _tmp30_ = NULL; GeeArrayList* _tmp31_ = NULL; @@ -705,14 +706,14 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _tmp31_ = _tmp30_->not_removed; #line 106 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 709 "SourceCollection.c" +#line 710 "SourceCollection.c" } #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp32_ = counter; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp33_ = _tmp32_->not_removed; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp35_ = _tmp34_; #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -721,19 +722,19 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g _g_object_unref0 (counter); #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 725 "SourceCollection.c" +#line 726 "SourceCollection.c" } static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user) { gboolean result = FALSE; gboolean success = FALSE; - gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp9_ = FALSE; - DataObject* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + gboolean _tmp5_ = FALSE; + gboolean _tmp10_ = FALSE; + DataObject* _tmp11_ = NULL; + GObject* _tmp12_ = NULL; + gboolean _tmp13_ = FALSE; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); @@ -743,7 +744,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE); #line 113 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = FALSE; -#line 747 "SourceCollection.c" +#line 748 "SourceCollection.c" { gboolean _tmp0_ = FALSE; DataObject* _tmp1_ = NULL; @@ -756,12 +757,12 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _tmp0_ = _tmp2_; #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 760 "SourceCollection.c" +#line 761 "SourceCollection.c" goto __catch49_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; -#line 765 "SourceCollection.c" +#line 766 "SourceCollection.c" } goto __finally49; __catch49_g_error: @@ -775,76 +776,78 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s success = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_error_free0 (err); -#line 779 "SourceCollection.c" +#line 780 "SourceCollection.c" } __finally49: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 785 "SourceCollection.c" + gboolean _tmp3_ = FALSE; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_clear_error (&_inner_error_); #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - return FALSE; -#line 790 "SourceCollection.c" + return _tmp3_; +#line 793 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp4_ = success; + _tmp5_ = success; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (!_tmp4_) { -#line 796 "SourceCollection.c" - DataObject* _tmp5_ = NULL; + if (!_tmp5_) { +#line 799 "SourceCollection.c" + DataObject* _tmp6_ = NULL; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = object; + _tmp6_ = object; #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_SOURCE); -#line 802 "SourceCollection.c" + _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE); +#line 805 "SourceCollection.c" } else { #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp3_ = FALSE; -#line 806 "SourceCollection.c" + _tmp4_ = FALSE; +#line 809 "SourceCollection.c" } #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp3_) { -#line 810 "SourceCollection.c" - GObject* _tmp6_ = NULL; - GeeArrayList* _tmp7_ = NULL; - DataObject* _tmp8_ = NULL; + if (_tmp4_) { +#line 813 "SourceCollection.c" + GObject* _tmp7_ = NULL; + GeeArrayList* _tmp8_ = NULL; + DataObject* _tmp9_ = NULL; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp6_ = user; + _tmp7_ = user; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp8_ = object; + _tmp9_ = object; #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 822 "SourceCollection.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)); +#line 825 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = object; + _tmp11_ = object; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp11_ = user; + _tmp12_ = user; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp12_ = source_collection_destroy_source (self, _tmp10_, _tmp11_); + _tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_); #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - if (_tmp12_) { -#line 832 "SourceCollection.c" - gboolean _tmp13_ = FALSE; + if (_tmp13_) { +#line 835 "SourceCollection.c" + gboolean _tmp14_ = FALSE; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp13_ = success; + _tmp14_ = success; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = _tmp13_; -#line 838 "SourceCollection.c" + _tmp10_ = _tmp14_; +#line 841 "SourceCollection.c" } else { #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp9_ = FALSE; -#line 842 "SourceCollection.c" + _tmp10_ = FALSE; +#line 845 "SourceCollection.c" } #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - result = _tmp9_; + result = _tmp10_; #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 848 "SourceCollection.c" +#line 851 "SourceCollection.c" } @@ -891,7 +894,7 @@ static gboolean source_collection_destroy_source (SourceCollection* self, DataOb _g_object_unref0 (source); #line 136 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 895 "SourceCollection.c" +#line 898 "SourceCollection.c" } @@ -900,7 +903,7 @@ static guint _source_backlink_hash_func_gee_hash_data_func (gconstpointer v, gpo result = source_backlink_hash_func ((SourceBacklink*) v); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 904 "SourceCollection.c" +#line 907 "SourceCollection.c" } @@ -909,7 +912,7 @@ static gboolean _source_backlink_equal_func_gee_equal_data_func (gconstpointer a result = source_backlink_equal_func ((SourceBacklink*) a, (SourceBacklink*) b); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 913 "SourceCollection.c" +#line 916 "SourceCollection.c" } @@ -928,15 +931,15 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp0_ = self->priv->backlinks; #line 141 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp0_ == NULL) { -#line 932 "SourceCollection.c" +#line 935 "SourceCollection.c" GeeHashMultiMap* _tmp1_ = NULL; #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _source_backlink_hash_func_gee_hash_data_func, NULL, NULL, _source_backlink_equal_func_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (self->priv->backlinks); #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap); -#line 940 "SourceCollection.c" +#line 943 "SourceCollection.c" } #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp2_ = self->priv->backlinks; @@ -946,7 +949,7 @@ void source_collection_internal_backlink_set (SourceCollection* self, DataSource _tmp4_ = source; #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" gee_multi_map_set (_tmp2_, _tmp3_, _tmp4_); -#line 950 "SourceCollection.c" +#line 953 "SourceCollection.c" } @@ -979,7 +982,7 @@ void source_collection_internal_backlink_removed (SourceCollection* self, DataSo removed = _tmp4_; #line 154 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _vala_assert (removed, "removed"); -#line 983 "SourceCollection.c" +#line 986 "SourceCollection.c" } @@ -993,7 +996,7 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp1_ = self->priv->backlinks; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (_tmp1_ != NULL) { -#line 997 "SourceCollection.c" +#line 1000 "SourceCollection.c" GeeMultiMap* _tmp2_ = NULL; SourceBacklink* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -1005,17 +1008,17 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou _tmp4_ = gee_multi_map_contains (_tmp2_, _tmp3_); #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = _tmp4_; -#line 1009 "SourceCollection.c" +#line 1012 "SourceCollection.c" } else { #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp0_ = FALSE; -#line 1013 "SourceCollection.c" +#line 1016 "SourceCollection.c" } #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" result = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1019 "SourceCollection.c" +#line 1022 "SourceCollection.c" } @@ -1024,7 +1027,7 @@ gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE); #line 157 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return SOURCE_COLLECTION_GET_CLASS (self)->has_backlink (self, backlink); -#line 1028 "SourceCollection.c" +#line 1031 "SourceCollection.c" } @@ -1033,7 +1036,7 @@ static gboolean _source_collection_prepare_for_unlink_marked_action (DataObject* result = source_collection_prepare_for_unlink ((SourceCollection*) self, object, user); #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1037 "SourceCollection.c" +#line 1040 "SourceCollection.c" } @@ -1057,7 +1060,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_val_if_fail (IS_MARKER (marker), NULL); #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" list = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1073,7 +1076,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp4_ = list; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp6_ = _tmp5_; #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1084,7 +1087,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* _g_object_unref0 (list); #line 166 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1088 "SourceCollection.c" +#line 1091 "SourceCollection.c" } #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = list; @@ -1104,7 +1107,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker* result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 172 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1108 "SourceCollection.c" +#line 1111 "SourceCollection.c" } @@ -1138,7 +1141,7 @@ static gboolean source_collection_prepare_for_unlink (SourceCollection* self, Da _g_object_unref0 (source); #line 181 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return result; -#line 1142 "SourceCollection.c" +#line 1145 "SourceCollection.c" } @@ -1175,7 +1178,7 @@ void source_collection_relink (SourceCollection* self, DataSource* source) { _tmp5_ = source; #line 190 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data_source_notify_relinked (_tmp5_); -#line 1179 "SourceCollection.c" +#line 1182 "SourceCollection.c" } @@ -1201,7 +1204,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (_tmp2_ == 0) { #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1205 "SourceCollection.c" +#line 1208 "SourceCollection.c" } { GeeIterator* _source_it = NULL; @@ -1215,7 +1218,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp4_; #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1219 "SourceCollection.c" +#line 1222 "SourceCollection.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; DataSource* source = NULL; @@ -1230,7 +1233,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp6_) { #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1234 "SourceCollection.c" +#line 1237 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp7_ = _source_it; @@ -1244,11 +1247,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinking (_tmp9_, self); #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1248 "SourceCollection.c" +#line 1251 "SourceCollection.c" } #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1252 "SourceCollection.c" +#line 1255 "SourceCollection.c" } #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp10_ = relink; @@ -1262,7 +1265,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _tmp13_ = relink; #line 201 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" source_collection_notify_items_relinked (self, _tmp13_); -#line 1266 "SourceCollection.c" +#line 1269 "SourceCollection.c" { GeeIterator* _source_it = NULL; GeeCollection* _tmp14_ = NULL; @@ -1275,7 +1278,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin _source_it = _tmp15_; #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1279 "SourceCollection.c" +#line 1282 "SourceCollection.c" GeeIterator* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; DataSource* source = NULL; @@ -1290,7 +1293,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin if (!_tmp17_) { #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1294 "SourceCollection.c" +#line 1297 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp18_ = _source_it; @@ -1304,11 +1307,11 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin data_source_notify_relinked (_tmp20_); #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1308 "SourceCollection.c" +#line 1311 "SourceCollection.c" } #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_it); -#line 1312 "SourceCollection.c" +#line 1315 "SourceCollection.c" } } @@ -1332,10 +1335,10 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (_tmp0_ == NULL) { #line 209 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return; -#line 1336 "SourceCollection.c" +#line 1339 "SourceCollection.c" } #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" sources = _tmp1_; #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1352,7 +1355,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour gee_array_list_add_all (_tmp2_, _tmp6_); #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_tmp6_); -#line 1356 "SourceCollection.c" +#line 1359 "SourceCollection.c" { GeeArrayList* _source_list = NULL; GeeArrayList* _tmp7_ = NULL; @@ -1371,7 +1374,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp9_ = _source_list; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp11_ = _tmp10_; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1380,7 +1383,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour _source_index = -1; #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" while (TRUE) { -#line 1384 "SourceCollection.c" +#line 1387 "SourceCollection.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gint _tmp14_ = 0; @@ -1402,7 +1405,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour if (!(_tmp13_ < _tmp14_)) { #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" break; -#line 1406 "SourceCollection.c" +#line 1409 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp15_ = _source_list; @@ -1420,11 +1423,11 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour data_source_remove_backlink (_tmp18_, _tmp19_); #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (source); -#line 1424 "SourceCollection.c" +#line 1427 "SourceCollection.c" } #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (_source_list); -#line 1428 "SourceCollection.c" +#line 1431 "SourceCollection.c" } #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _tmp20_ = backlink; @@ -1434,7 +1437,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour source_collection_notify_backlink_removed (self, _tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" _g_object_unref0 (sources); -#line 1438 "SourceCollection.c" +#line 1441 "SourceCollection.c" } @@ -1443,42 +1446,42 @@ void source_collection_remove_backlink (SourceCollection* self, SourceBacklink* g_return_if_fail (IS_SOURCE_COLLECTION (self)); #line 207 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" SOURCE_COLLECTION_GET_CLASS (self)->remove_backlink (self, backlink); -#line 1447 "SourceCollection.c" +#line 1450 "SourceCollection.c" } static void source_collection_real_items_unlinking (SourceCollection* self, GeeCollection* unlinking) { #line 20 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (unlinking)); -#line 1454 "SourceCollection.c" +#line 1457 "SourceCollection.c" } static void source_collection_real_items_relinked (SourceCollection* self, GeeCollection* relinked) { #line 25 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (relinked)); -#line 1461 "SourceCollection.c" +#line 1464 "SourceCollection.c" } static void source_collection_real_item_destroyed (SourceCollection* self, DataSource* source) { #line 30 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1468 "SourceCollection.c" +#line 1471 "SourceCollection.c" } static void source_collection_real_items_destroyed (SourceCollection* self, GeeCollection* destroyed) { #line 35 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1475 "SourceCollection.c" +#line 1478 "SourceCollection.c" } static void source_collection_real_unlinked_destroyed (SourceCollection* self, DataSource* source) { #line 40 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (IS_DATA_SOURCE (source)); -#line 1482 "SourceCollection.c" +#line 1485 "SourceCollection.c" } @@ -1487,7 +1490,7 @@ static void source_collection_real_backlink_removed (SourceCollection* self, Sou g_return_if_fail (IS_SOURCE_BACKLINK (backlink)); #line 44 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); -#line 1491 "SourceCollection.c" +#line 1494 "SourceCollection.c" } @@ -1506,19 +1509,19 @@ static void g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT (GClosure * clo data1 = closure->data; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = param_values->data[0].v_pointer; -#line 1510 "SourceCollection.c" +#line 1513 "SourceCollection.c" } else { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data1 = param_values->data[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" data2 = closure->data; -#line 1516 "SourceCollection.c" +#line 1519 "SourceCollection.c" } #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback = (GMarshalFunc_VOID__SOURCE_BACKLINK_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" callback (data1, value_get_source_backlink (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 1522 "SourceCollection.c" +#line 1525 "SourceCollection.c" } @@ -1540,14 +1543,14 @@ static SourceCollectionDestroyCounter* source_collection_destroy_counter_constru self->remove_marker = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return self; -#line 1544 "SourceCollection.c" +#line 1547 "SourceCollection.c" } static SourceCollectionDestroyCounter* source_collection_destroy_counter_new (Marker* remove_marker) { #line 13 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" return source_collection_destroy_counter_construct (SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, remove_marker); -#line 1551 "SourceCollection.c" +#line 1554 "SourceCollection.c" } @@ -1556,7 +1559,7 @@ static void source_collection_destroy_counter_class_init (SourceCollectionDestro source_collection_destroy_counter_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (klass)->finalize = source_collection_destroy_counter_finalize; -#line 1560 "SourceCollection.c" +#line 1563 "SourceCollection.c" } @@ -1564,14 +1567,14 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes GeeArrayList* _tmp0_ = NULL; GeeArrayList* _tmp1_ = NULL; #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->notify_list = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.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 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->not_removed = _tmp1_; -#line 1575 "SourceCollection.c" +#line 1578 "SourceCollection.c" } @@ -1587,7 +1590,7 @@ static void source_collection_destroy_counter_finalize (GObject* obj) { _g_object_unref0 (self->not_removed); #line 8 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" G_OBJECT_CLASS (source_collection_destroy_counter_parent_class)->finalize (obj); -#line 1591 "SourceCollection.c" +#line 1594 "SourceCollection.c" } @@ -1611,25 +1614,25 @@ static void source_collection_class_init (SourceCollectionClass * klass) { #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_type_class_add_private (klass, sizeof (SourceCollectionPrivate)); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) source_collection_real_holds_type_of_source; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_unlinking = source_collection_real_notify_items_unlinking; + ((SourceCollectionClass *) klass)->notify_items_unlinking = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_relinked = source_collection_real_notify_items_relinked; + ((SourceCollectionClass *) klass)->notify_items_relinked = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_relinked; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_item_destroyed = source_collection_real_notify_item_destroyed; + ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_item_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_items_destroyed = source_collection_real_notify_items_destroyed; + ((SourceCollectionClass *) klass)->notify_items_destroyed = (void (*)(SourceCollection*, GeeCollection*)) source_collection_real_notify_items_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = source_collection_real_notify_unlinked_destroyed; + ((SourceCollectionClass *) klass)->notify_unlinked_destroyed = (void (*)(SourceCollection*, DataSource*)) source_collection_real_notify_unlinked_destroyed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->notify_backlink_removed = source_collection_real_notify_backlink_removed; + ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) source_collection_real_notify_backlink_removed; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((DataCollectionClass *) klass)->valid_type = source_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) source_collection_real_valid_type; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->has_backlink = source_collection_real_has_backlink; + ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) source_collection_real_has_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" - ((SourceCollectionClass *) klass)->remove_backlink = source_collection_real_remove_backlink; + ((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) source_collection_real_remove_backlink; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" ((SourceCollectionClass *) klass)->items_unlinking = source_collection_real_items_unlinking; #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -1654,7 +1657,7 @@ static void source_collection_class_init (SourceCollectionClass * klass) { g_signal_new ("unlinked_destroyed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, unlinked_destroyed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" g_signal_new ("backlink_removed", TYPE_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceCollectionClass, backlink_removed), NULL, NULL, g_cclosure_user_marshal_VOID__SOURCE_BACKLINK_OBJECT, G_TYPE_NONE, 2, TYPE_SOURCE_BACKLINK, GEE_TYPE_COLLECTION); -#line 1658 "SourceCollection.c" +#line 1661 "SourceCollection.c" } @@ -1663,7 +1666,7 @@ static void source_collection_instance_init (SourceCollection * self) { self->priv = SOURCE_COLLECTION_GET_PRIVATE (self); #line 48 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" self->priv->backlinks = NULL; -#line 1667 "SourceCollection.c" +#line 1670 "SourceCollection.c" } @@ -1675,7 +1678,7 @@ static void source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->backlinks); #line 7 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" DATA_COLLECTION_CLASS (source_collection_parent_class)->finalize (obj); -#line 1679 "SourceCollection.c" +#line 1682 "SourceCollection.c" } -- cgit v1.2.3