diff options
Diffstat (limited to 'src/core/ViewCollection.c')
| -rw-r--r-- | src/core/ViewCollection.c | 211 |
1 files changed, 106 insertions, 105 deletions
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index fd1e603..505093d 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.34.4, the Vala compiler +/* ViewCollection.c generated by valac 0.34.7, the Vala compiler * generated from ViewCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -910,7 +910,7 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio GeeCollection* _tmp30_ = NULL; GeeCollection* _tmp31_ = NULL; #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sum); #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -1370,7 +1370,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection GeeCollection* _tmp26_ = NULL; GeeCollection* _tmp27_ = NULL; #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" created_views = _tmp12_; #line 1376 "ViewCollection.c" @@ -1689,7 +1689,7 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_VIEW_COLLECTION (to_copy)); #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" copy_view = _tmp0_; #line 1695 "ViewCollection.c" @@ -2298,7 +2298,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* GeeArrayList* _tmp35_ = NULL; DataView* _tmp36_ = NULL; #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (created_views); #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2367,7 +2367,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection* #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp41_ = created_views; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp43_ = _tmp42_; #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -2953,7 +2953,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec #line 2953 "ViewCollection.c" GeeArrayList* _tmp45_ = NULL; #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_add); #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3014,7 +3014,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec #line 3014 "ViewCollection.c" GeeArrayList* _tmp57_ = NULL; #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_remove); #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3221,7 +3221,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" to_add = _tmp0_; #line 3227 "ViewCollection.c" @@ -3337,7 +3337,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp19_ = to_add; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp21_ = _tmp20_; #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3591,7 +3591,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt #line 3591 "ViewCollection.c" GeeArrayList* _tmp19_ = NULL; #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_selected); #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3637,7 +3637,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt #line 3637 "ViewCollection.c" GeeArrayList* _tmp27_ = NULL; #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (added_visible); #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -3866,7 +3866,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee #line 3866 "ViewCollection.c" GeeArrayList* _tmp31_ = NULL; #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (selected_removed); #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4032,7 +4032,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle #line 4032 "ViewCollection.c" GeeArrayList* _tmp11_ = NULL; #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_show); #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -4067,7 +4067,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle #line 4067 "ViewCollection.c" GeeArrayList* _tmp17_ = NULL; #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (to_hide); #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5162,7 +5162,7 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_DATA_SOURCE (home), NULL); #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5473,7 +5473,7 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_MARKER (marker)); #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" selected = _tmp0_; #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5485,7 +5485,7 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) { #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = selected; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _tmp4_; #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5640,7 +5640,7 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_MARKER (marker)); #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5652,7 +5652,7 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) { #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp3_ = unselected; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp5_ = _tmp4_; #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5906,7 +5906,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (IS_MARKER (select)); #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -5916,7 +5916,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u #line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection)); #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" selected = _tmp2_; #line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6246,7 +6246,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_LIST (to_hide)); #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" unselected = _tmp0_; #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6395,7 +6395,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide) #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp29_ = unselected; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp31_ = _tmp30_; #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6455,7 +6455,7 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show) #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_if_fail (GEE_IS_LIST (to_show)); #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" added_selected = _tmp0_; #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6755,7 +6755,7 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) { #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp0_ = self->priv->source_map; #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.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 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = _tmp1_; #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -6800,7 +6800,7 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) { #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp2_ = self->priv->source_map; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap)); + _tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _tmp4_ = _tmp3_; #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7076,7 +7076,7 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) { #line 7076 "ViewCollection.c" GeeArrayList* _tmp17_ = NULL; #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7119,7 +7119,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) { #line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL); #line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.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 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList); #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7351,7 +7351,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy #line 7351 "ViewCollection.c" GeeArrayList* _tmp17_ = NULL; #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (sources); #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7471,7 +7471,7 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie #line 7471 "ViewCollection.c" GeeHashSet* _tmp6_ = NULL; #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_views_altered); #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -7530,7 +7530,7 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat #line 7530 "ViewCollection.c" GeeHashSet* _tmp6_ = NULL; #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" _g_object_unref0 (self->priv->frozen_geometries_altered); #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8315,11 +8315,11 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList GeeArrayList* _tmp0_ = NULL; GeeArrayList* _tmp1_ = NULL; #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->selected = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->unselected = _tmp1_; #line 8325 "ViewCollection.c" @@ -8360,69 +8360,69 @@ static void view_collection_class_init (ViewCollectionClass * klass) { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_class_add_private (klass, sizeof (ViewCollectionPrivate)); #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_selected_unselected = view_collection_real_notify_items_selected_unselected; + ((ViewCollectionClass *) klass)->notify_items_selected_unselected = (void (*)(ViewCollection*, GeeCollection*, GeeCollection*)) view_collection_real_notify_items_selected_unselected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_selection_group_altered = view_collection_real_notify_selection_group_altered; + ((ViewCollectionClass *) klass)->notify_selection_group_altered = (void (*)(ViewCollection*)) view_collection_real_notify_selection_group_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_item_view_altered = view_collection_real_notify_item_view_altered; + ((ViewCollectionClass *) klass)->notify_item_view_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_view_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_views_altered = view_collection_real_notify_views_altered; + ((ViewCollectionClass *) klass)->notify_views_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_views_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_item_geometry_altered = view_collection_real_notify_item_geometry_altered; + ((ViewCollectionClass *) klass)->notify_item_geometry_altered = (void (*)(ViewCollection*, DataView*)) view_collection_real_notify_item_geometry_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_geometries_altered = view_collection_real_notify_geometries_altered; + ((ViewCollectionClass *) klass)->notify_geometries_altered = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_geometries_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_shown = view_collection_real_notify_items_shown; + ((ViewCollectionClass *) klass)->notify_items_shown = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_shown; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_hidden = view_collection_real_notify_items_hidden; + ((ViewCollectionClass *) klass)->notify_items_hidden = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_hidden; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_items_visibility_changed = view_collection_real_notify_items_visibility_changed; + ((ViewCollectionClass *) klass)->notify_items_visibility_changed = (void (*)(ViewCollection*, GeeCollection*)) view_collection_real_notify_items_visibility_changed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_view_filter_installed = view_collection_real_notify_view_filter_installed; + ((ViewCollectionClass *) klass)->notify_view_filter_installed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_installed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->notify_view_filter_removed = view_collection_real_notify_view_filter_removed; + ((ViewCollectionClass *) klass)->notify_view_filter_removed = (void (*)(ViewCollection*, ViewFilter*)) view_collection_real_notify_view_filter_removed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->clear = view_collection_real_clear; + ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) view_collection_real_clear; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->close = view_collection_real_close; + ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) view_collection_real_close; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->valid_type = view_collection_real_valid_type; + ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_valid_type; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->add = view_collection_real_add; + ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_add; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->add_many = view_collection_real_add_many; + ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) view_collection_real_add_many; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_items_added = view_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_added; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_items_removed = view_collection_real_notify_items_removed; + ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) view_collection_real_notify_items_removed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->items_altered = view_collection_real_items_altered; + ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) view_collection_real_items_altered; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->set_comparator = view_collection_real_set_comparator; + ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) view_collection_real_set_comparator; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->reset_comparator = view_collection_real_reset_comparator; + ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) view_collection_real_reset_comparator; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_all = view_collection_real_get_all; + ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) view_collection_real_get_all; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_count = view_collection_real_get_count; + ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) view_collection_real_get_count; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->get_at = view_collection_real_get_at; + ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) view_collection_real_get_at; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->index_of = view_collection_real_index_of; + ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) view_collection_real_index_of; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->contains = view_collection_real_contains; + ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) view_collection_real_contains; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_first = view_collection_real_get_first; + ((ViewCollectionClass *) klass)->get_first = (DataView* (*)(ViewCollection*)) view_collection_real_get_first; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_first_unrejected = view_collection_real_get_first_unrejected; + ((ViewCollectionClass *) klass)->get_first_unrejected = (DataView* (*)(ViewCollection*)) view_collection_real_get_first_unrejected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_last = view_collection_real_get_last; + ((ViewCollectionClass *) klass)->get_last = (DataView* (*)(ViewCollection*)) view_collection_real_get_last; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_next = view_collection_real_get_next; + ((ViewCollectionClass *) klass)->get_next = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_next; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewCollectionClass *) klass)->get_previous = view_collection_real_get_previous; + ((ViewCollectionClass *) klass)->get_previous = (DataView* (*)(ViewCollection*, DataView*)) view_collection_real_get_previous; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((DataCollectionClass *) klass)->notify_thawed = view_collection_real_notify_thawed; + ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) view_collection_real_notify_thawed; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewCollectionClass *) klass)->items_selected = view_collection_real_items_selected; #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8487,7 +8487,7 @@ static void view_collection_instance_init (ViewCollection * self) { #line 21 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv = VIEW_COLLECTION_GET_PRIVATE (self); #line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp0_ = gee_hash_multi_map_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, VIEW_COLLECTION_TYPE_MONITOR_IMPL, (GBoxedCopyFunc) view_collection_monitor_ref, view_collection_monitor_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_multi_map_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, VIEW_COLLECTION_TYPE_MONITOR_IMPL, (GBoxedCopyFunc) view_collection_monitor_ref, (GDestroyNotify) view_collection_monitor_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->monitors = _tmp0_; #line 61 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8497,7 +8497,7 @@ static void view_collection_instance_init (ViewCollection * self) { #line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->should_mirror = NULL; #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, (GDestroyNotify) view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->filters = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); #line 65 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" @@ -8511,7 +8511,7 @@ static void view_collection_instance_init (ViewCollection * self) { #line 68 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->frozen_geometries_altered = NULL; #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - _tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->priv->source_map = _tmp3_; #line 8517 "ViewCollection.c" @@ -8791,9 +8791,9 @@ static void view_manager_class_init (ViewManagerClass * klass) { #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewManagerClass *) klass)->finalize = view_manager_finalize; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewManagerClass *) klass)->include_in_view = view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) view_manager_real_include_in_view; #line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewManagerClass *) klass)->create_view = view_manager_real_create_view; + ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) view_manager_real_create_view; #line 8797 "ViewCollection.c" } @@ -8855,11 +8855,12 @@ void view_manager_unref (gpointer instance) { static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) { + gboolean _tmp0_ = FALSE; #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - return FALSE; -#line 8862 "ViewCollection.c" + return _tmp0_; +#line 8863 "ViewCollection.c" } @@ -8868,7 +8869,7 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) { g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE); #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return VIEW_FILTER_GET_CLASS (self)->predicate (self, view); -#line 8871 "ViewCollection.c" +#line 8872 "ViewCollection.c" } @@ -8878,7 +8879,7 @@ ViewFilter* view_filter_construct (GType object_type) { self = (ViewFilter*) g_type_create_instance (object_type); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return self; -#line 8881 "ViewCollection.c" +#line 8882 "ViewCollection.c" } @@ -8889,7 +8890,7 @@ static void view_filter_real_refresh (ViewFilter* self) { static void value_view_filter_init (GValue* value) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8892 "ViewCollection.c" +#line 8893 "ViewCollection.c" } @@ -8898,7 +8899,7 @@ static void value_view_filter_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (value->data[0].v_pointer); -#line 8901 "ViewCollection.c" +#line 8902 "ViewCollection.c" } } @@ -8908,11 +8909,11 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_ if (src_value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer); -#line 8911 "ViewCollection.c" +#line 8912 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" dest_value->data[0].v_pointer = NULL; -#line 8915 "ViewCollection.c" +#line 8916 "ViewCollection.c" } } @@ -8920,37 +8921,37 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_ static gpointer value_view_filter_peek_pointer (const GValue* value) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 8923 "ViewCollection.c" +#line 8924 "ViewCollection.c" } static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (collect_values[0].v_pointer) { -#line 8930 "ViewCollection.c" +#line 8931 "ViewCollection.c" ViewFilter* object; object = collect_values[0].v_pointer; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (object->parent_instance.g_class == NULL) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8937 "ViewCollection.c" +#line 8938 "ViewCollection.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.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 8941 "ViewCollection.c" +#line 8942 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = view_filter_ref (object); -#line 8945 "ViewCollection.c" +#line 8946 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 8949 "ViewCollection.c" +#line 8950 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8953 "ViewCollection.c" +#line 8954 "ViewCollection.c" } @@ -8961,25 +8962,25 @@ static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collec if (!object_p) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8964 "ViewCollection.c" +#line 8965 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (!value->data[0].v_pointer) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = NULL; -#line 8970 "ViewCollection.c" +#line 8971 "ViewCollection.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = value->data[0].v_pointer; -#line 8974 "ViewCollection.c" +#line 8975 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" *object_p = view_filter_ref (value->data[0].v_pointer); -#line 8978 "ViewCollection.c" +#line 8979 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return NULL; -#line 8982 "ViewCollection.c" +#line 8983 "ViewCollection.c" } @@ -8993,7 +8994,7 @@ GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return G_PARAM_SPEC (spec); -#line 8996 "ViewCollection.c" +#line 8997 "ViewCollection.c" } @@ -9002,7 +9003,7 @@ gpointer value_get_view_filter (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return value->data[0].v_pointer; -#line 9005 "ViewCollection.c" +#line 9006 "ViewCollection.c" } @@ -9022,17 +9023,17 @@ void value_set_view_filter (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_ref (value->data[0].v_pointer); -#line 9025 "ViewCollection.c" +#line 9026 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9029 "ViewCollection.c" +#line 9030 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9035 "ViewCollection.c" +#line 9036 "ViewCollection.c" } } @@ -9051,17 +9052,17 @@ void value_take_view_filter (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = v_object; -#line 9054 "ViewCollection.c" +#line 9055 "ViewCollection.c" } else { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" value->data[0].v_pointer = NULL; -#line 9058 "ViewCollection.c" +#line 9059 "ViewCollection.c" } #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" if (old) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" view_filter_unref (old); -#line 9064 "ViewCollection.c" +#line 9065 "ViewCollection.c" } } @@ -9072,19 +9073,19 @@ static void view_filter_class_init (ViewFilterClass * klass) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewFilterClass *) klass)->finalize = view_filter_finalize; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" - ((ViewFilterClass *) klass)->predicate = view_filter_real_predicate; + ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) view_filter_real_predicate; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" ((ViewFilterClass *) klass)->refresh = view_filter_real_refresh; #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9080 "ViewCollection.c" +#line 9081 "ViewCollection.c" } static void view_filter_instance_init (ViewFilter * self) { #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" self->ref_count = 1; -#line 9087 "ViewCollection.c" +#line 9088 "ViewCollection.c" } @@ -9094,7 +9095,7 @@ static void view_filter_finalize (ViewFilter* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_signal_handlers_destroy (self); -#line 9097 "ViewCollection.c" +#line 9098 "ViewCollection.c" } @@ -9119,7 +9120,7 @@ gpointer view_filter_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" return instance; -#line 9122 "ViewCollection.c" +#line 9123 "ViewCollection.c" } @@ -9132,7 +9133,7 @@ void view_filter_unref (gpointer instance) { VIEW_FILTER_GET_CLASS (self)->finalize (self); #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9135 "ViewCollection.c" +#line 9136 "ViewCollection.c" } } |