summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:51:46 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:51:46 +0200
commit9e7cd144725a270e0460b21747619f447ca87684 (patch)
tree77916a766425839c1a2466afd2eb1244371b6b9b /src/core
parent3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff)
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Alteration.c6
-rw-r--r--src/core/ContainerSourceCollection.c26
-rw-r--r--src/core/Core.c2
-rw-r--r--src/core/DataCollection.c82
-rw-r--r--src/core/DataObject.c14
-rw-r--r--src/core/DataSet.c6
-rw-r--r--src/core/DataSource.c687
-rw-r--r--src/core/DataSourceTypes.c89
-rw-r--r--src/core/DataView.c12
-rw-r--r--src/core/DataViewTypes.c4
-rw-r--r--src/core/DatabaseSourceCollection.c12
-rw-r--r--src/core/SourceCollection.c291
-rw-r--r--src/core/SourceHoldingTank.c16
-rw-r--r--src/core/SourceInterfaces.c2
-rw-r--r--src/core/Tracker.c2
-rw-r--r--src/core/ViewCollection.c211
-rw-r--r--src/core/util.c16
17 files changed, 745 insertions, 733 deletions
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index e9e435b..b1e62b6 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.34.4, the Vala compiler
+/* Alteration.c generated by valac 0.34.7, the Vala compiler
* generated from Alteration.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -635,7 +635,7 @@ static GeeMultiMap* alteration_create_map (Alteration* self) {
#line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala"
g_return_val_if_fail (IS_ALTERATION (self), NULL);
#line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
- _tmp0_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL);
+ _tmp0_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL);
#line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
#line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1065,7 +1065,7 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
GeeArrayList* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
#line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
- _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
details = _tmp7_;
#line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala"
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 26d26bd..247e471 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.34.4, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.34.7, the Vala compiler
* generated from ContainerSourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -869,7 +869,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
#line 124 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_freeze_attached_notifications (self);
#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_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_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
map = _tmp0_;
#line 876 "ContainerSourceCollection.c"
@@ -1125,7 +1125,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
#line 147 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_freeze_attached_notifications (self);
#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_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_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
map = _tmp0_;
#line 1132 "ContainerSourceCollection.c"
@@ -2039,21 +2039,21 @@ static void container_source_collection_class_init (ContainerSourceCollectionCla
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_type_class_add_private (klass, sizeof (ContainerSourceCollectionPrivate));
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((SourceCollectionClass *) klass)->notify_backlink_removed = container_source_collection_real_notify_backlink_removed;
+ ((SourceCollectionClass *) klass)->notify_backlink_removed = (void (*)(SourceCollection*, SourceBacklink*, GeeCollection*)) container_source_collection_real_notify_backlink_removed;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = container_source_collection_real_notify_container_contents_added;
+ ((ContainerSourceCollectionClass *) klass)->notify_container_contents_added = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_added;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = container_source_collection_real_notify_container_contents_removed;
+ ((ContainerSourceCollectionClass *) klass)->notify_container_contents_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_removed;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = container_source_collection_real_notify_container_contents_altered;
+ ((ContainerSourceCollectionClass *) klass)->notify_container_contents_altered = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*, gboolean, GeeCollection*, gboolean)) container_source_collection_real_notify_container_contents_altered;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = container_source_collection_real_notify_backlink_to_container_removed;
+ ((ContainerSourceCollectionClass *) klass)->notify_backlink_to_container_removed = (void (*)(ContainerSourceCollection*, ContainerSource*, GeeCollection*)) container_source_collection_real_notify_backlink_to_container_removed;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = container_source_collection_real_get_containers_holding_source;
+ ((ContainerSourceCollectionClass *) klass)->get_containers_holding_source = (GeeCollection* (*)(ContainerSourceCollection*, DataSource*)) container_source_collection_real_get_containers_holding_source;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = container_source_collection_real_convert_backlink_to_container;
+ ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*)(ContainerSourceCollection*, SourceBacklink*)) container_source_collection_real_convert_backlink_to_container;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- ((SourceCollectionClass *) klass)->notify_item_destroyed = container_source_collection_real_notify_item_destroyed;
+ ((SourceCollectionClass *) klass)->notify_item_destroyed = (void (*)(SourceCollection*, DataSource*)) container_source_collection_real_notify_item_destroyed;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
((ContainerSourceCollectionClass *) klass)->container_contents_added = container_source_collection_real_container_contents_added;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
@@ -2080,11 +2080,11 @@ static void container_source_collection_instance_init (ContainerSourceCollection
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self->priv = CONTAINER_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _tmp0_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self->priv->attached_collections = _tmp0_;
#line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self->priv->holding_tank = _tmp1_;
#line 2089 "ContainerSourceCollection.c"
diff --git a/src/core/Core.c b/src/core/Core.c
index 7316e4d..d67d1ab 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.34.4, the Vala compiler
+/* Core.c generated by valac 0.34.7, the Vala compiler
* generated from Core.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 6f03093..21c509f 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.4, the Vala compiler
+/* DataCollection.c generated by valac 0.34.7, the Vala compiler
* generated from DataCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -589,7 +589,7 @@ GeeCollection* data_collection_get_singleton (DataObject* object) {
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp0_ = object;
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_);
+ _tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
#line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -609,7 +609,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration
#line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (IS_ALTERATION (alteration), NULL);
#line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp0_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
#line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1259,7 +1259,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
#line 330 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (objects), NULL);
#line 332 "/home/jens/Source/shotwell/src/core/DataCollection.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 332 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
added = _tmp0_;
#line 1266 "DataCollection.c"
@@ -1352,7 +1352,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
#line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp16_ = added;
#line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp18_ = _tmp17_;
#line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1572,7 +1572,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
#line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp6_ = _tmp5_->marked;
#line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp8_ = _tmp7_;
#line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1829,7 +1829,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
#line 1828 "DataCollection.c"
GeeArrayList* _tmp18_ = NULL;
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (skipped);
#line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1883,7 +1883,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp27_ = _tmp26_->marked;
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp29_ = _tmp28_;
#line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1996,7 +1996,7 @@ static void data_collection_real_clear (DataCollection* self) {
#line 1995 "DataCollection.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
removed = _tmp2_;
#line 2001 "DataCollection.c"
@@ -2084,7 +2084,7 @@ static void data_collection_real_clear (DataCollection* self) {
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp16_ = _object_list;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp18_ = _tmp17_;
#line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2233,7 +2233,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
#line 2232 "DataCollection.c"
GeeHashMap* _tmp8_ = NULL;
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, (GDestroyNotify) alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_g_object_unref0 (self->priv->frozen_items_altered);
#line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2897,7 +2897,7 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- callback (data1, g_value_get_string (param_values + 1), g_value_get_boxed (param_values + 2), g_value_get_boxed (param_values + 3), data2);
+ callback (data1, g_value_get_string (param_values + 1), g_value_get_pointer (param_values + 2), g_value_get_boxed (param_values + 3), data2);
#line 2900 "DataCollection.c"
}
@@ -3319,7 +3319,7 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp2_ = self->marked;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp4_ = _tmp3_;
#line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3350,7 +3350,7 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
#line 76 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_COLLECTION_TYPE_MARKER_IMPL, DataCollectionMarkerImpl);
#line 77 "/home/jens/Source/shotwell/src/core/DataCollection.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 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
copy = _tmp0_;
#line 78 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3454,7 +3454,7 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp1_ = self->marked;
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
_tmp3_ = _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3539,7 +3539,7 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa
static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) {
GeeHashSet* _tmp0_ = NULL;
#line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->marked = _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3772,51 +3772,51 @@ static void data_collection_class_init (DataCollectionClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_type_class_add_private (klass, sizeof (DataCollectionPrivate));
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->to_string = data_collection_real_to_string;
+ ((DataCollectionClass *) klass)->to_string = (gchar* (*)(DataCollection*)) data_collection_real_to_string;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_added = data_collection_real_notify_items_added;
+ ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_added;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_removed = data_collection_real_notify_items_removed;
+ ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) data_collection_real_notify_items_removed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_contents_altered = data_collection_real_notify_contents_altered;
+ ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) data_collection_real_notify_contents_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_altered = data_collection_real_notify_items_altered;
+ ((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) data_collection_real_notify_items_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_ordering_changed = data_collection_real_notify_ordering_changed;
+ ((DataCollectionClass *) klass)->notify_ordering_changed = (void (*)(DataCollection*)) data_collection_real_notify_ordering_changed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_property_set = data_collection_real_notify_property_set;
+ ((DataCollectionClass *) klass)->notify_property_set = (void (*)(DataCollection*, const gchar*, GValue*, GValue*)) data_collection_real_notify_property_set;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_property_cleared = data_collection_real_notify_property_cleared;
+ ((DataCollectionClass *) klass)->notify_property_cleared = (void (*)(DataCollection*, const gchar*)) data_collection_real_notify_property_cleared;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->valid_type = data_collection_real_valid_type;
+ ((DataCollectionClass *) klass)->valid_type = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_valid_type;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->set_comparator = data_collection_real_set_comparator;
+ ((DataCollectionClass *) klass)->set_comparator = (void (*)(DataCollection*, Comparator, void*, ComparatorPredicate, void*)) data_collection_real_set_comparator;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->reset_comparator = data_collection_real_reset_comparator;
+ ((DataCollectionClass *) klass)->reset_comparator = (void (*)(DataCollection*)) data_collection_real_reset_comparator;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_all = data_collection_real_get_all;
+ ((DataCollectionClass *) klass)->get_all = (GeeCollection* (*)(DataCollection*)) data_collection_real_get_all;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_count = data_collection_real_get_count;
+ ((DataCollectionClass *) klass)->get_count = (gint (*)(DataCollection*)) data_collection_real_get_count;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->get_at = data_collection_real_get_at;
+ ((DataCollectionClass *) klass)->get_at = (DataObject* (*)(DataCollection*, gint)) data_collection_real_get_at;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->index_of = data_collection_real_index_of;
+ ((DataCollectionClass *) klass)->index_of = (gint (*)(DataCollection*, DataObject*)) data_collection_real_index_of;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->contains = data_collection_real_contains;
+ ((DataCollectionClass *) klass)->contains = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_contains;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->add = data_collection_real_add;
+ ((DataCollectionClass *) klass)->add = (gboolean (*)(DataCollection*, DataObject*)) data_collection_real_add;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->add_many = data_collection_real_add_many;
+ ((DataCollectionClass *) klass)->add_many = (GeeCollection* (*)(DataCollection*, GeeCollection*, ProgressMonitor, void*)) data_collection_real_add_many;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->remove_marked = data_collection_real_remove_marked;
+ ((DataCollectionClass *) klass)->remove_marked = (void (*)(DataCollection*, Marker*)) data_collection_real_remove_marked;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->clear = data_collection_real_clear;
+ ((DataCollectionClass *) klass)->clear = (void (*)(DataCollection*)) data_collection_real_clear;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->close = data_collection_real_close;
+ ((DataCollectionClass *) klass)->close = (void (*)(DataCollection*)) data_collection_real_close;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_frozen = data_collection_real_notify_frozen;
+ ((DataCollectionClass *) klass)->notify_frozen = (void (*)(DataCollection*)) data_collection_real_notify_frozen;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- ((DataCollectionClass *) klass)->notify_thawed = data_collection_real_notify_thawed;
+ ((DataCollectionClass *) klass)->notify_thawed = (void (*)(DataCollection*)) data_collection_real_notify_thawed;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
((DataCollectionClass *) klass)->items_added = data_collection_real_items_added;
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3846,7 +3846,7 @@ static void data_collection_class_init (DataCollectionClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_signal_new ("ordering_changed", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, ordering_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_VALUE);
+ g_signal_new ("property_set", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_set), NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_VALUE);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
g_signal_new ("property_cleared", TYPE_DATA_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataCollectionClass, property_cleared), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3867,7 +3867,7 @@ static void data_collection_instance_init (DataCollection * self) {
#line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->priv->dataset = _tmp0_;
#line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
- _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, (GDestroyNotify) _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
self->priv->properties = _tmp1_;
#line 110 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 372fce2..58505c6 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.34.4, the Vala compiler
+/* DataObject.c generated by valac 0.34.7, the Vala compiler
* generated from DataObject.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -586,17 +586,17 @@ static void data_object_class_init (DataObjectClass * klass) {
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
g_type_class_add_private (klass, sizeof (DataObjectPrivate));
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->notify_altered = data_object_real_notify_altered;
+ ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_object_real_notify_altered;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->notify_membership_changed = data_object_real_notify_membership_changed;
+ ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_object_real_notify_membership_changed;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->notify_collection_property_set = data_object_real_notify_collection_property_set;
+ ((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) data_object_real_notify_collection_property_set;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->notify_collection_property_cleared = data_object_real_notify_collection_property_cleared;
+ ((DataObjectClass *) klass)->notify_collection_property_cleared = (void (*)(DataObject*, const gchar*)) data_object_real_notify_collection_property_cleared;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->get_name = data_object_real_get_name;
+ ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_object_real_get_name;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
- ((DataObjectClass *) klass)->to_string = data_object_real_to_string;
+ ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_object_real_to_string;
#line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
G_OBJECT_CLASS (klass)->finalize = data_object_finalize;
#line 603 "DataObject.c"
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index d0a3119..a6ea6b0 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.34.4, the Vala compiler
+/* DataSet.c generated by valac 0.34.7, the Vala compiler
* generated from DataSet.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1090,11 +1090,11 @@ static void data_set_instance_init (DataSet * self) {
#line 29 "/home/jens/Source/shotwell/src/core/DataSet.vala"
self->priv = DATA_SET_GET_PRIVATE (self);
#line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala"
- _tmp0_ = sorted_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL);
+ _tmp0_ = sorted_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL);
#line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala"
self->priv->list = _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
- _tmp1_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
self->priv->hash_set = _tmp1_;
#line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 4d1d881..c95b8ce 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.34.4, the Vala compiler
+/* DataSource.c generated by valac 0.34.7, the Vala compiler
* generated from DataSource.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -695,7 +695,7 @@ static void data_source_real_notify_unlinking (DataSource* self, SourceCollectio
#line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->unlinked_from_collection = _tmp3_;
#line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (self->priv->backlinks);
#line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -745,7 +745,7 @@ static void data_source_real_notify_unlinked (DataSource* self) {
#line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp4_ = self->priv->backlinks;
#line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp5_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap));
+ _tmp5_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp6_ = _tmp5_;
#line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -898,11 +898,12 @@ gchar* data_source_get_typename (DataSource* self) {
static gint64 data_source_real_get_instance_id (DataSource* self) {
+ gint64 _tmp0_ = 0LL;
#line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_critical ("Type `%s' does not implement abstract method `data_source_get_instance_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- return 0LL;
-#line 906 "DataSource.c"
+ return _tmp0_;
+#line 907 "DataSource.c"
}
@@ -911,7 +912,7 @@ gint64 data_source_get_instance_id (DataSource* self) {
g_return_val_if_fail (IS_DATA_SOURCE (self), 0LL);
#line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return DATA_SOURCE_GET_CLASS (self)->get_instance_id (self);
-#line 915 "DataSource.c"
+#line 916 "DataSource.c"
}
@@ -938,7 +939,7 @@ static gchar* data_source_real_get_source_id (DataSource* self) {
result = _tmp4_;
#line 167 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 942 "DataSource.c"
+#line 943 "DataSource.c"
}
@@ -947,7 +948,7 @@ gchar* data_source_get_source_id (DataSource* self) {
g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
#line 166 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return DATA_SOURCE_GET_CLASS (self)->get_source_id (self);
-#line 951 "DataSource.c"
+#line 952 "DataSource.c"
}
@@ -974,7 +975,7 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
result = FALSE;
#line 172 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 978 "DataSource.c"
+#line 979 "DataSource.c"
}
#line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = self->priv->backlinks;
@@ -992,7 +993,7 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp7_ = values;
#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ != NULL) {
-#line 996 "DataSource.c"
+#line 997 "DataSource.c"
GeeList* _tmp8_ = NULL;
SourceBacklink* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
@@ -1010,11 +1011,11 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp6_ = _tmp12_;
-#line 1014 "DataSource.c"
+#line 1015 "DataSource.c"
} else {
#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp6_ = FALSE;
-#line 1018 "DataSource.c"
+#line 1019 "DataSource.c"
}
#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
result = _tmp6_;
@@ -1022,14 +1023,14 @@ gboolean data_source_has_backlink (DataSource* self, SourceBacklink* backlink) {
_g_object_unref0 (values);
#line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1026 "DataSource.c"
+#line 1027 "DataSource.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return self ? g_object_ref (self) : NULL;
-#line 1033 "DataSource.c"
+#line 1034 "DataSource.c"
}
@@ -1056,7 +1057,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
result = NULL;
#line 181 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1060 "DataSource.c"
+#line 1061 "DataSource.c"
}
#line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = self->priv->backlinks;
@@ -1072,7 +1073,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
if (_tmp5_ == NULL) {
#line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp4_ = TRUE;
-#line 1076 "DataSource.c"
+#line 1077 "DataSource.c"
} else {
GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -1085,7 +1086,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
_tmp8_ = _tmp7_;
#line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp4_ = _tmp8_ == 0;
-#line 1089 "DataSource.c"
+#line 1090 "DataSource.c"
}
#line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp4_) {
@@ -1095,13 +1096,13 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
_g_object_unref0 (values);
#line 185 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1099 "DataSource.c"
+#line 1100 "DataSource.c"
}
#line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, source_backlink_unref, NULL, NULL, NULL);
+ _tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, (GDestroyNotify) source_backlink_unref, NULL, NULL, NULL);
#line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala"
backlinks = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList);
-#line 1105 "DataSource.c"
+#line 1106 "DataSource.c"
{
GeeList* _value_list = NULL;
GeeList* _tmp10_ = NULL;
@@ -1129,7 +1130,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
_value_index = -1;
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 1133 "DataSource.c"
+#line 1134 "DataSource.c"
gint _tmp15_ = 0;
gint _tmp16_ = 0;
gint _tmp17_ = 0;
@@ -1154,7 +1155,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
if (!(_tmp16_ < _tmp17_)) {
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 1158 "DataSource.c"
+#line 1159 "DataSource.c"
}
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp18_ = _value_list;
@@ -1180,11 +1181,11 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
_source_backlink_unref0 (_tmp25_);
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (value);
-#line 1184 "DataSource.c"
+#line 1185 "DataSource.c"
}
#line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (_value_list);
-#line 1188 "DataSource.c"
+#line 1189 "DataSource.c"
}
#line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala"
result = backlinks;
@@ -1192,7 +1193,7 @@ GeeList* data_source_get_backlinks (DataSource* self, const gchar* name) {
_g_object_unref0 (values);
#line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1196 "DataSource.c"
+#line 1197 "DataSource.c"
}
@@ -1236,7 +1237,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp6_ = values;
#line 199 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp6_ == NULL) {
-#line 1240 "DataSource.c"
+#line 1241 "DataSource.c"
GeeArrayList* _tmp7_ = NULL;
GeeHashMap* _tmp8_ = NULL;
SourceBacklink* _tmp9_ = NULL;
@@ -1244,7 +1245,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
const gchar* _tmp11_ = NULL;
GeeList* _tmp12_ = NULL;
#line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (values);
#line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1261,7 +1262,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp12_ = values;
#line 201 "/home/jens/Source/shotwell/src/core/DataSource.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 1265 "DataSource.c"
+#line 1266 "DataSource.c"
}
#line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp13_ = values;
@@ -1281,7 +1282,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp18_ = sources;
#line 207 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp18_ != NULL) {
-#line 1285 "DataSource.c"
+#line 1286 "DataSource.c"
SourceCollection* _tmp19_ = NULL;
SourceBacklink* _tmp20_ = NULL;
#line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1290,13 +1291,13 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
_tmp20_ = backlink;
#line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_collection_internal_backlink_set (_tmp19_, self, _tmp20_);
-#line 1294 "DataSource.c"
+#line 1295 "DataSource.c"
}
#line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_data_collection_unref0 (sources);
#line 194 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (values);
-#line 1300 "DataSource.c"
+#line 1301 "DataSource.c"
}
@@ -1343,7 +1344,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
result = FALSE;
#line 213 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1347 "DataSource.c"
+#line 1348 "DataSource.c"
}
#line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = self->priv->backlinks;
@@ -1367,7 +1368,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_g_object_unref0 (values);
#line 217 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1371 "DataSource.c"
+#line 1372 "DataSource.c"
}
#line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp7_ = values;
@@ -1389,7 +1390,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
iter = _tmp12_;
#line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 1393 "DataSource.c"
+#line 1394 "DataSource.c"
GeeIterator* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
GeeIterator* _tmp15_ = NULL;
@@ -1407,7 +1408,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
if (!_tmp14_) {
#line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 1411 "DataSource.c"
+#line 1412 "DataSource.c"
}
#line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp15_ = iter;
@@ -1427,13 +1428,13 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_g_free0 (_tmp17_);
#line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp21_) {
-#line 1431 "DataSource.c"
+#line 1432 "DataSource.c"
GeeIterator* _tmp22_ = NULL;
#line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp22_ = iter;
#line 225 "/home/jens/Source/shotwell/src/core/DataSource.vala"
gee_iterator_remove (_tmp22_);
-#line 1437 "DataSource.c"
+#line 1438 "DataSource.c"
}
}
#line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1444,7 +1445,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_tmp25_ = _tmp24_;
#line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp25_ == 0) {
-#line 1448 "DataSource.c"
+#line 1449 "DataSource.c"
GeeHashMap* _tmp26_ = NULL;
SourceBacklink* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
@@ -1459,7 +1460,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_tmp29_ = _tmp28_;
#line 229 "/home/jens/Source/shotwell/src/core/DataSource.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, NULL);
-#line 1463 "DataSource.c"
+#line 1464 "DataSource.c"
}
#line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp30_ = self->priv->unlinked_from_collection;
@@ -1479,7 +1480,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_tmp34_ = sources;
#line 236 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp34_ != NULL) {
-#line 1483 "DataSource.c"
+#line 1484 "DataSource.c"
SourceCollection* _tmp35_ = NULL;
SourceBacklink* _tmp36_ = NULL;
#line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1488,7 +1489,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_tmp36_ = backlink;
#line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_);
-#line 1492 "DataSource.c"
+#line 1493 "DataSource.c"
}
#line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp37_ = values;
@@ -1508,7 +1509,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
_g_object_unref0 (values);
#line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1512 "DataSource.c"
+#line 1513 "DataSource.c"
}
@@ -1523,18 +1524,18 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio
if (_tmp1_ != NULL) {
#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = TRUE;
-#line 1527 "DataSource.c"
+#line 1528 "DataSource.c"
} else {
const gchar* _tmp2_ = NULL;
#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = dehydrated;
#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = _tmp2_ != NULL;
-#line 1534 "DataSource.c"
+#line 1535 "DataSource.c"
}
#line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp0_) {
-#line 1538 "DataSource.c"
+#line 1539 "DataSource.c"
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
#line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1545,7 +1546,7 @@ static void data_source_real_commit_backlinks (DataSource* self, SourceCollectio
g_warning ("DataSource.vala:250: No implementation to commit link state for %s", _tmp4_);
#line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (_tmp4_);
-#line 1549 "DataSource.c"
+#line 1550 "DataSource.c"
}
}
@@ -1555,7 +1556,7 @@ void data_source_commit_backlinks (DataSource* self, SourceCollection* sources,
g_return_if_fail (IS_DATA_SOURCE (self));
#line 248 "/home/jens/Source/shotwell/src/core/DataSource.vala"
DATA_SOURCE_GET_CLASS (self)->commit_backlinks (self, sources, dehydrated);
-#line 1559 "DataSource.c"
+#line 1560 "DataSource.c"
}
@@ -1579,7 +1580,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
if (_tmp1_ == NULL) {
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = TRUE;
-#line 1583 "DataSource.c"
+#line 1584 "DataSource.c"
} else {
GeeHashMap* _tmp2_ = NULL;
gint _tmp3_ = 0;
@@ -1587,12 +1588,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = self->priv->backlinks;
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+ _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp4_ = _tmp3_;
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = _tmp4_ == 0;
-#line 1596 "DataSource.c"
+#line 1597 "DataSource.c"
}
#line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp0_) {
@@ -1600,13 +1601,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
result = NULL;
#line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1604 "DataSource.c"
+#line 1605 "DataSource.c"
}
#line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = g_string_new ("");
#line 257 "/home/jens/Source/shotwell/src/core/DataSource.vala"
builder = _tmp5_;
-#line 1610 "DataSource.c"
+#line 1611 "DataSource.c"
{
GeeIterator* _name_it = NULL;
GeeHashMap* _tmp6_ = NULL;
@@ -1618,7 +1619,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp6_ = self->priv->backlinks;
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap));
+ _tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp8_ = _tmp7_;
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1633,7 +1634,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_name_it = _tmp11_;
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 1637 "DataSource.c"
+#line 1638 "DataSource.c"
GeeIterator* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
gchar* name = NULL;
@@ -1658,7 +1659,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
if (!_tmp13_) {
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 1662 "DataSource.c"
+#line 1663 "DataSource.c"
}
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp14_ = _name_it;
@@ -1680,7 +1681,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
if (_tmp20_ == NULL) {
#line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp19_ = TRUE;
-#line 1684 "DataSource.c"
+#line 1685 "DataSource.c"
} else {
GeeList* _tmp21_ = NULL;
gint _tmp22_ = 0;
@@ -1693,7 +1694,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_tmp23_ = _tmp22_;
#line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp19_ = _tmp23_ == 0;
-#line 1697 "DataSource.c"
+#line 1698 "DataSource.c"
}
#line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp19_) {
@@ -1703,13 +1704,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_g_free0 (name);
#line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala"
continue;
-#line 1707 "DataSource.c"
+#line 1708 "DataSource.c"
}
#line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp24_ = g_strdup ("");
#line 263 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value_field = _tmp24_;
-#line 1713 "DataSource.c"
+#line 1714 "DataSource.c"
{
GeeList* _value_list = NULL;
GeeList* _tmp25_ = NULL;
@@ -1737,7 +1738,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_value_index = -1;
#line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 1741 "DataSource.c"
+#line 1742 "DataSource.c"
gint _tmp30_ = 0;
gint _tmp31_ = 0;
gint _tmp32_ = 0;
@@ -1759,7 +1760,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
if (!(_tmp31_ < _tmp32_)) {
#line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 1763 "DataSource.c"
+#line 1764 "DataSource.c"
}
#line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp33_ = _value_list;
@@ -1775,7 +1776,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_tmp37_ = is_string_empty (_tmp36_);
#line 265 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp37_) {
-#line 1779 "DataSource.c"
+#line 1780 "DataSource.c"
const gchar* _tmp38_ = NULL;
const gchar* _tmp39_ = NULL;
gchar* _tmp40_ = NULL;
@@ -1797,15 +1798,15 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
value_field = _tmp42_;
#line 266 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (_tmp41_);
-#line 1801 "DataSource.c"
+#line 1802 "DataSource.c"
}
#line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (value);
-#line 1805 "DataSource.c"
+#line 1806 "DataSource.c"
}
#line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (_value_list);
-#line 1809 "DataSource.c"
+#line 1810 "DataSource.c"
}
#line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp43_ = value_field;
@@ -1815,7 +1816,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_tmp45_ = _tmp44_;
#line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp45_ > 0) {
-#line 1819 "DataSource.c"
+#line 1820 "DataSource.c"
GString* _tmp46_ = NULL;
const gchar* _tmp47_ = NULL;
const gchar* _tmp48_ = NULL;
@@ -1835,7 +1836,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
g_string_append (_tmp46_, _tmp50_);
#line 270 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (_tmp50_);
-#line 1839 "DataSource.c"
+#line 1840 "DataSource.c"
}
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (value_field);
@@ -1843,11 +1844,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_g_object_unref0 (values);
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (name);
-#line 1847 "DataSource.c"
+#line 1848 "DataSource.c"
}
#line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (_name_it);
-#line 1851 "DataSource.c"
+#line 1852 "DataSource.c"
}
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp52_ = builder;
@@ -1859,7 +1860,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_tmp55_ = _tmp54_;
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp55_ > 0) {
-#line 1863 "DataSource.c"
+#line 1864 "DataSource.c"
GString* _tmp56_ = NULL;
const gchar* _tmp57_ = NULL;
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1868,11 +1869,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_tmp57_ = _tmp56_->str;
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp51_ = _tmp57_;
-#line 1872 "DataSource.c"
+#line 1873 "DataSource.c"
} else {
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp51_ = NULL;
-#line 1876 "DataSource.c"
+#line 1877 "DataSource.c"
}
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp58_ = g_strdup (_tmp51_);
@@ -1882,7 +1883,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
_g_string_free0 (builder);
#line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 1886 "DataSource.c"
+#line 1887 "DataSource.c"
}
@@ -1907,7 +1908,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
#line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->unlinked_from_collection = _tmp0_;
#line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (self->priv->backlinks);
#line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1918,7 +1919,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
if (_tmp2_ == NULL) {
#line 283 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return;
-#line 1922 "DataSource.c"
+#line 1923 "DataSource.c"
}
#line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp3_ = dehydrated;
@@ -1934,7 +1935,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp6_ = lines;
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp6__length1 = lines_length1;
-#line 1938 "DataSource.c"
+#line 1939 "DataSource.c"
{
gchar** line_collection = NULL;
gint line_collection_length1 = 0;
@@ -1946,14 +1947,14 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
line_collection_length1 = _tmp6__length1;
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
for (line_it = 0; line_it < _tmp6__length1; line_it = line_it + 1) {
-#line 1950 "DataSource.c"
+#line 1951 "DataSource.c"
gchar* _tmp7_ = NULL;
gchar* line = NULL;
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp7_ = g_strdup (line_collection[line_it]);
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
line = _tmp7_;
-#line 1957 "DataSource.c"
+#line 1958 "DataSource.c"
{
const gchar* _tmp8_ = NULL;
gint _tmp9_ = 0;
@@ -1993,7 +1994,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_g_free0 (line);
#line 288 "/home/jens/Source/shotwell/src/core/DataSource.vala"
continue;
-#line 1997 "DataSource.c"
+#line 1998 "DataSource.c"
}
#line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp11_ = line;
@@ -2011,7 +2012,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp14__length1 = tokens_length1;
#line 291 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp14__length1 < 2) {
-#line 2015 "DataSource.c"
+#line 2016 "DataSource.c"
const gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
@@ -2032,7 +2033,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_g_free0 (line);
#line 295 "/home/jens/Source/shotwell/src/core/DataSource.vala"
continue;
-#line 2035 "DataSource.c"
+#line 2036 "DataSource.c"
}
#line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp18_ = tokens;
@@ -2049,14 +2050,14 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
#line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_decoded_values_size_ = decoded_values_length1;
#line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala"
values = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_LIST, GeeList);
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp23_ = decoded_values;
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp23__length1 = decoded_values_length1;
-#line 2059 "DataSource.c"
+#line 2060 "DataSource.c"
{
gchar** value_collection = NULL;
gint value_collection_length1 = 0;
@@ -2068,14 +2069,14 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
value_collection_length1 = _tmp23__length1;
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
for (value_it = 0; value_it < _tmp23__length1; value_it = value_it + 1) {
-#line 2071 "DataSource.c"
+#line 2072 "DataSource.c"
gchar* _tmp24_ = NULL;
gchar* value = NULL;
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp24_ = g_strdup (value_collection[value_it]);
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value = _tmp24_;
-#line 2078 "DataSource.c"
+#line 2079 "DataSource.c"
{
gboolean _tmp25_ = FALSE;
const gchar* _tmp26_ = NULL;
@@ -2083,7 +2084,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp26_ = value;
#line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp26_ != NULL) {
-#line 2086 "DataSource.c"
+#line 2087 "DataSource.c"
const gchar* _tmp27_ = NULL;
gint _tmp28_ = 0;
gint _tmp29_ = 0;
@@ -2095,15 +2096,15 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp29_ = _tmp28_;
#line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp25_ = _tmp29_ > 0;
-#line 2098 "DataSource.c"
+#line 2099 "DataSource.c"
} else {
#line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp25_ = FALSE;
-#line 2102 "DataSource.c"
+#line 2103 "DataSource.c"
}
#line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp25_) {
-#line 2106 "DataSource.c"
+#line 2107 "DataSource.c"
GeeList* _tmp30_ = NULL;
const gchar* _tmp31_ = NULL;
#line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2112,11 +2113,11 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp31_ = value;
#line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 2115 "DataSource.c"
+#line 2116 "DataSource.c"
}
#line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (value);
-#line 2119 "DataSource.c"
+#line 2120 "DataSource.c"
}
}
}
@@ -2128,7 +2129,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp34_ = _tmp33_;
#line 305 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp34_ > 0) {
-#line 2131 "DataSource.c"
+#line 2132 "DataSource.c"
GeeHashMap* _tmp35_ = NULL;
gchar** _tmp36_ = NULL;
gint _tmp36__length1 = 0;
@@ -2146,7 +2147,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
_tmp38_ = values;
#line 306 "/home/jens/Source/shotwell/src/core/DataSource.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp37_, _tmp38_);
-#line 2149 "DataSource.c"
+#line 2150 "DataSource.c"
}
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (values);
@@ -2156,13 +2157,13 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
tokens = (_vala_array_free (tokens, tokens_length1, (GDestroyNotify) g_free), NULL);
#line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (line);
-#line 2159 "DataSource.c"
+#line 2160 "DataSource.c"
}
}
}
#line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala"
lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
-#line 2165 "DataSource.c"
+#line 2166 "DataSource.c"
}
@@ -2172,7 +2173,7 @@ static SourceSnapshot* data_source_real_save_snapshot (DataSource* self) {
result = NULL;
#line 312 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 2175 "DataSource.c"
+#line 2176 "DataSource.c"
}
@@ -2181,7 +2182,7 @@ SourceSnapshot* data_source_save_snapshot (DataSource* self) {
g_return_val_if_fail (IS_DATA_SOURCE (self), NULL);
#line 311 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return DATA_SOURCE_GET_CLASS (self)->save_snapshot (self);
-#line 2184 "DataSource.c"
+#line 2185 "DataSource.c"
}
@@ -2190,7 +2191,7 @@ void data_source_internal_mark_for_destroy (DataSource* self) {
g_return_if_fail (IS_DATA_SOURCE (self));
#line 317 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->marked_for_destroy = TRUE;
-#line 2193 "DataSource.c"
+#line 2194 "DataSource.c"
}
@@ -2200,7 +2201,7 @@ static gboolean data_source_real_internal_delete_backing (DataSource* self, GErr
result = TRUE;
#line 325 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 2203 "DataSource.c"
+#line 2204 "DataSource.c"
}
@@ -2209,7 +2210,7 @@ gboolean data_source_internal_delete_backing (DataSource* self, GError** error)
g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
#line 324 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return DATA_SOURCE_GET_CLASS (self)->internal_delete_backing (self, error);
-#line 2212 "DataSource.c"
+#line 2213 "DataSource.c"
}
@@ -2224,7 +2225,7 @@ static gboolean data_source_real_equals (DataSource* self, DataSource* source) {
result = self == _tmp0_;
#line 331 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 2227 "DataSource.c"
+#line 2228 "DataSource.c"
}
@@ -2233,7 +2234,7 @@ gboolean data_source_equals (DataSource* self, DataSource* source) {
g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
#line 330 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return DATA_SOURCE_GET_CLASS (self)->equals (self, source);
-#line 2236 "DataSource.c"
+#line 2237 "DataSource.c"
}
@@ -2245,19 +2246,19 @@ static void data_source_real_destroy (DataSource* self) {
_vala_assert (_tmp0_, "marked_for_destroy");
#line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->is_destroyed = TRUE;
-#line 2248 "DataSource.c"
+#line 2249 "DataSource.c"
{
gint ctr = 0;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = 0;
-#line 2253 "DataSource.c"
+#line 2254 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = TRUE;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 2260 "DataSource.c"
+#line 2261 "DataSource.c"
gint _tmp3_ = 0;
DataView** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -2267,13 +2268,13 @@ static void data_source_real_destroy (DataSource* self) {
DataView* _tmp7_ = NULL;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp1_) {
-#line 2270 "DataSource.c"
+#line 2271 "DataSource.c"
gint _tmp2_ = 0;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = ctr;
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = _tmp2_ + 1;
-#line 2276 "DataSource.c"
+#line 2277 "DataSource.c"
}
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
@@ -2287,7 +2288,7 @@ static void data_source_real_destroy (DataSource* self) {
if (!(_tmp3_ < _tmp4__length1)) {
#line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 2290 "DataSource.c"
+#line 2291 "DataSource.c"
}
#line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->subscribers;
@@ -2299,7 +2300,7 @@ static void data_source_real_destroy (DataSource* self) {
_tmp7_ = _tmp5_[_tmp6_];
#line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ != NULL) {
-#line 2302 "DataSource.c"
+#line 2303 "DataSource.c"
DataView* view = NULL;
DataView** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
@@ -2341,14 +2342,14 @@ static void data_source_real_destroy (DataSource* self) {
data_view_notify_unsubscribed (_tmp15_, self);
#line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (view);
-#line 2344 "DataSource.c"
+#line 2345 "DataSource.c"
}
}
}
}
#line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_emit_by_name (self, "destroyed");
-#line 2351 "DataSource.c"
+#line 2352 "DataSource.c"
}
@@ -2357,7 +2358,7 @@ void data_source_destroy (DataSource* self) {
g_return_if_fail (IS_DATA_SOURCE (self));
#line 340 "/home/jens/Source/shotwell/src/core/DataSource.vala"
DATA_SOURCE_GET_CLASS (self)->destroy (self);
-#line 2360 "DataSource.c"
+#line 2361 "DataSource.c"
}
@@ -2365,7 +2366,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
gboolean result = FALSE;
gboolean ret = FALSE;
gboolean _tmp0_ = FALSE;
- SourceCollection* _tmp10_ = NULL;
+ SourceCollection* _tmp11_ = NULL;
GError * _inner_error_ = NULL;
#line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
@@ -2375,7 +2376,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
_tmp0_ = delete_backing;
#line 368 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp0_) {
-#line 2378 "DataSource.c"
+#line 2379 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
@@ -2386,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
_tmp1_ = _tmp2_;
#line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2389 "DataSource.c"
+#line 2390 "DataSource.c"
goto __catch50_g_error;
}
#line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2395,7 +2396,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
_tmp3_ = ret;
#line 371 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp3_) {
-#line 2398 "DataSource.c"
+#line 2399 "DataSource.c"
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
#line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2406,7 +2407,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
g_warning ("DataSource.vala:372: Unable to delete backing for %s", _tmp5_);
#line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (_tmp5_);
-#line 2409 "DataSource.c"
+#line 2410 "DataSource.c"
}
}
goto __finally50;
@@ -2437,18 +2438,20 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
ret = FALSE;
#line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_error_free0 (err);
-#line 2440 "DataSource.c"
+#line 2441 "DataSource.c"
}
__finally50:
#line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2446 "DataSource.c"
+ gboolean _tmp10_ = FALSE;
#line 369 "/home/jens/Source/shotwell/src/core/DataSource.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 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_clear_error (&_inner_error_);
#line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- return FALSE;
-#line 2451 "DataSource.c"
+ return _tmp10_;
+#line 2454 "DataSource.c"
}
}
#line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2456,22 +2459,22 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
#line 381 "/home/jens/Source/shotwell/src/core/DataSource.vala"
data_source_destroy (self);
#line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp10_ = self->priv->unlinked_from_collection;
+ _tmp11_ = self->priv->unlinked_from_collection;
#line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- if (_tmp10_ != NULL) {
-#line 2462 "DataSource.c"
- SourceCollection* _tmp11_ = NULL;
+ if (_tmp11_ != NULL) {
+#line 2465 "DataSource.c"
+ SourceCollection* _tmp12_ = NULL;
#line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- _tmp11_ = self->priv->unlinked_from_collection;
+ _tmp12_ = self->priv->unlinked_from_collection;
#line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- source_collection_notify_unlinked_destroyed (_tmp11_, self);
-#line 2468 "DataSource.c"
+ source_collection_notify_unlinked_destroyed (_tmp12_, self);
+#line 2471 "DataSource.c"
}
#line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala"
result = ret;
#line 386 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 2474 "DataSource.c"
+#line 2477 "DataSource.c"
}
@@ -2482,13 +2485,13 @@ static void _vala_array_add63 (DataView*** array, int* length, int* size, DataVi
*size = (*size) ? (2 * (*size)) : 4;
#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*array = g_renew (DataView*, *array, (*size) + 1);
-#line 2485 "DataSource.c"
+#line 2488 "DataSource.c"
}
#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
(*array)[(*length)++] = value;
#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
(*array)[*length] = NULL;
-#line 2491 "DataSource.c"
+#line 2494 "DataSource.c"
}
@@ -2506,19 +2509,19 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
_tmp0_ = self->priv->in_contact;
#line 396 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_vala_assert (!_tmp0_, "!in_contact");
-#line 2509 "DataSource.c"
+#line 2512 "DataSource.c"
{
gint ctr = 0;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = 0;
-#line 2514 "DataSource.c"
+#line 2517 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = TRUE;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 2521 "DataSource.c"
+#line 2524 "DataSource.c"
gint _tmp3_ = 0;
DataView** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -2528,13 +2531,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
DataView* _tmp7_ = NULL;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp1_) {
-#line 2531 "DataSource.c"
+#line 2534 "DataSource.c"
gint _tmp2_ = 0;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = ctr;
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = _tmp2_ + 1;
-#line 2537 "DataSource.c"
+#line 2540 "DataSource.c"
}
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
@@ -2548,7 +2551,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
if (!(_tmp3_ < _tmp4__length1)) {
#line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 2551 "DataSource.c"
+#line 2554 "DataSource.c"
}
#line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->subscribers;
@@ -2560,7 +2563,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
_tmp7_ = _tmp5_[_tmp6_];
#line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ == NULL) {
-#line 2563 "DataSource.c"
+#line 2566 "DataSource.c"
DataView** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
gint _tmp9_ = 0;
@@ -2585,7 +2588,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
_tmp12_ = _tmp8_[_tmp9_];
#line 402 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return;
-#line 2588 "DataSource.c"
+#line 2591 "DataSource.c"
}
}
}
@@ -2600,7 +2603,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
_tmp15_ = _g_object_ref0 (_tmp14_);
#line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
-#line 2603 "DataSource.c"
+#line 2606 "DataSource.c"
}
@@ -2614,19 +2617,19 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
_tmp0_ = self->priv->in_contact;
#line 412 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_vala_assert (!_tmp0_, "!in_contact");
-#line 2617 "DataSource.c"
+#line 2620 "DataSource.c"
{
gint ctr = 0;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = 0;
-#line 2622 "DataSource.c"
+#line 2625 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = TRUE;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 2629 "DataSource.c"
+#line 2632 "DataSource.c"
gint _tmp3_ = 0;
DataView** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -2637,13 +2640,13 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
DataView* _tmp8_ = NULL;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp1_) {
-#line 2640 "DataSource.c"
+#line 2643 "DataSource.c"
gint _tmp2_ = 0;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = ctr;
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = _tmp2_ + 1;
-#line 2646 "DataSource.c"
+#line 2649 "DataSource.c"
}
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
@@ -2657,7 +2660,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
if (!(_tmp3_ < _tmp4__length1)) {
#line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 2660 "DataSource.c"
+#line 2663 "DataSource.c"
}
#line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->subscribers;
@@ -2671,7 +2674,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
_tmp8_ = view;
#line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ == _tmp8_) {
-#line 2674 "DataSource.c"
+#line 2677 "DataSource.c"
DataView** _tmp9_ = NULL;
gint _tmp9__length1 = 0;
gint _tmp10_ = 0;
@@ -2690,7 +2693,7 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
_tmp11_ = _tmp9_[_tmp10_];
#line 418 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return;
-#line 2693 "DataSource.c"
+#line 2696 "DataSource.c"
}
}
}
@@ -2708,19 +2711,19 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
_vala_assert (!_tmp0_, "!in_contact");
#line 426 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->in_contact = TRUE;
-#line 2711 "DataSource.c"
+#line 2714 "DataSource.c"
{
gint ctr = 0;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = 0;
-#line 2716 "DataSource.c"
+#line 2719 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = TRUE;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 2723 "DataSource.c"
+#line 2726 "DataSource.c"
gint _tmp3_ = 0;
DataView** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -2730,13 +2733,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
DataView* _tmp7_ = NULL;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp1_) {
-#line 2733 "DataSource.c"
+#line 2736 "DataSource.c"
gint _tmp2_ = 0;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = ctr;
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = _tmp2_ + 1;
-#line 2739 "DataSource.c"
+#line 2742 "DataSource.c"
}
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
@@ -2750,7 +2753,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
if (!(_tmp3_ < _tmp4__length1)) {
#line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 2753 "DataSource.c"
+#line 2756 "DataSource.c"
}
#line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->subscribers;
@@ -2762,7 +2765,7 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
_tmp7_ = _tmp5_[_tmp6_];
#line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ != NULL) {
-#line 2765 "DataSource.c"
+#line 2768 "DataSource.c"
DataSourceContactSubscriber _tmp8_ = NULL;
void* _tmp8__target = NULL;
DataView** _tmp9_ = NULL;
@@ -2783,14 +2786,14 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
_tmp11_ = _tmp9_[_tmp10_];
#line 429 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp8_ (_tmp11_, _tmp8__target);
-#line 2786 "DataSource.c"
+#line 2789 "DataSource.c"
}
}
}
}
#line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->in_contact = FALSE;
-#line 2793 "DataSource.c"
+#line 2796 "DataSource.c"
}
@@ -2806,19 +2809,19 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
_vala_assert (!_tmp0_, "!in_contact");
#line 437 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->in_contact = TRUE;
-#line 2809 "DataSource.c"
+#line 2812 "DataSource.c"
{
gint ctr = 0;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = 0;
-#line 2814 "DataSource.c"
+#line 2817 "DataSource.c"
{
gboolean _tmp1_ = FALSE;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = TRUE;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 2821 "DataSource.c"
+#line 2824 "DataSource.c"
gint _tmp3_ = 0;
DataView** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -2828,13 +2831,13 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
DataView* _tmp7_ = NULL;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp1_) {
-#line 2831 "DataSource.c"
+#line 2834 "DataSource.c"
gint _tmp2_ = 0;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = ctr;
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
ctr = _tmp2_ + 1;
-#line 2837 "DataSource.c"
+#line 2840 "DataSource.c"
}
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
@@ -2848,7 +2851,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
if (!(_tmp3_ < _tmp4__length1)) {
#line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 2851 "DataSource.c"
+#line 2854 "DataSource.c"
}
#line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->subscribers;
@@ -2860,7 +2863,7 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
_tmp7_ = _tmp5_[_tmp6_];
#line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp7_ != NULL) {
-#line 2863 "DataSource.c"
+#line 2866 "DataSource.c"
DataView** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
gint _tmp9_ = 0;
@@ -2878,21 +2881,21 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
_tmp11_ = alteration;
#line 440 "/home/jens/Source/shotwell/src/core/DataSource.vala"
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject), _tmp11_);
-#line 2881 "DataSource.c"
+#line 2884 "DataSource.c"
}
}
}
}
#line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->in_contact = FALSE;
-#line 2888 "DataSource.c"
+#line 2891 "DataSource.c"
}
static void data_source_real_unlinked (DataSource* self, SourceCollection* sources) {
#line 51 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_return_if_fail (IS_SOURCE_COLLECTION (sources));
-#line 2895 "DataSource.c"
+#line 2898 "DataSource.c"
}
@@ -2911,26 +2914,26 @@ static void g_cclosure_user_marshal_VOID__DATA_COLLECTION (GClosure * closure, G
data1 = closure->data;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
data2 = param_values->data[0].v_pointer;
-#line 2914 "DataSource.c"
+#line 2917 "DataSource.c"
} else {
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
data1 = param_values->data[0].v_pointer;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
data2 = closure->data;
-#line 2920 "DataSource.c"
+#line 2923 "DataSource.c"
}
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
callback = (GMarshalFunc_VOID__DATA_COLLECTION) (marshal_data ? marshal_data : cc->callback);
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
callback (data1, value_get_data_collection (param_values + 1), data2);
-#line 2926 "DataSource.c"
+#line 2929 "DataSource.c"
}
static void data_source_real_relinked (DataSource* self, SourceCollection* sources) {
#line 55 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_return_if_fail (IS_SOURCE_COLLECTION (sources));
-#line 2933 "DataSource.c"
+#line 2936 "DataSource.c"
}
@@ -2944,35 +2947,35 @@ static void data_source_class_init (DataSourceClass * klass) {
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_class_add_private (klass, sizeof (DataSourcePrivate));
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataObjectClass *) klass)->notify_membership_changed = data_source_real_notify_membership_changed;
+ ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) data_source_real_notify_membership_changed;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->notify_held_in_tank = data_source_real_notify_held_in_tank;
+ ((DataSourceClass *) klass)->notify_held_in_tank = (void (*)(DataSource*, SourceHoldingTank*)) data_source_real_notify_held_in_tank;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataObjectClass *) klass)->notify_altered = data_source_real_notify_altered;
+ ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) data_source_real_notify_altered;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->notify_unlinking = data_source_real_notify_unlinking;
+ ((DataSourceClass *) klass)->notify_unlinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_unlinking;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->notify_unlinked = data_source_real_notify_unlinked;
+ ((DataSourceClass *) klass)->notify_unlinked = (void (*)(DataSource*)) data_source_real_notify_unlinked;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->notify_relinking = data_source_real_notify_relinking;
+ ((DataSourceClass *) klass)->notify_relinking = (void (*)(DataSource*, SourceCollection*)) data_source_real_notify_relinking;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->notify_relinked = data_source_real_notify_relinked;
+ ((DataSourceClass *) klass)->notify_relinked = (void (*)(DataSource*)) data_source_real_notify_relinked;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->get_typename = data_source_real_get_typename;
+ ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) data_source_real_get_typename;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->get_instance_id = data_source_real_get_instance_id;
+ ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) data_source_real_get_instance_id;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->get_source_id = data_source_real_get_source_id;
+ ((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) data_source_real_get_source_id;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->commit_backlinks = data_source_real_commit_backlinks;
+ ((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) data_source_real_commit_backlinks;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->save_snapshot = data_source_real_save_snapshot;
+ ((DataSourceClass *) klass)->save_snapshot = (SourceSnapshot* (*)(DataSource*)) data_source_real_save_snapshot;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->internal_delete_backing = data_source_real_internal_delete_backing;
+ ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) data_source_real_internal_delete_backing;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->equals = data_source_real_equals;
+ ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) data_source_real_equals;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((DataSourceClass *) klass)->destroy = data_source_real_destroy;
+ ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) data_source_real_destroy;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
((DataSourceClass *) klass)->unlinked = data_source_real_unlinked;
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2987,7 +2990,7 @@ static void data_source_class_init (DataSourceClass * klass) {
g_signal_new ("relinked", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, relinked), NULL, NULL, g_cclosure_user_marshal_VOID__DATA_COLLECTION, G_TYPE_NONE, 1, TYPE_SOURCE_COLLECTION);
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_new ("destroyed", TYPE_DATA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataSourceClass, destroyed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2990 "DataSource.c"
+#line 2993 "DataSource.c"
}
@@ -3015,7 +3018,7 @@ static void data_source_instance_init (DataSource * self) {
self->priv->marked_for_destroy = FALSE;
#line 48 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->is_destroyed = FALSE;
-#line 3018 "DataSource.c"
+#line 3021 "DataSource.c"
}
@@ -3031,7 +3034,7 @@ static void data_source_finalize (GObject* obj) {
_g_object_unref0 (self->priv->backlinks);
#line 38 "/home/jens/Source/shotwell/src/core/DataSource.vala"
G_OBJECT_CLASS (data_source_parent_class)->finalize (obj);
-#line 3034 "DataSource.c"
+#line 3037 "DataSource.c"
}
@@ -3052,7 +3055,7 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self) {
self->priv->snapshot_broken = TRUE;
#line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_emit_by_name (self, "broken");
-#line 3055 "DataSource.c"
+#line 3058 "DataSource.c"
}
@@ -3061,7 +3064,7 @@ void source_snapshot_notify_broken (SourceSnapshot* self) {
g_return_if_fail (IS_SOURCE_SNAPSHOT (self));
#line 454 "/home/jens/Source/shotwell/src/core/DataSource.vala"
SOURCE_SNAPSHOT_GET_CLASS (self)->notify_broken (self);
-#line 3064 "DataSource.c"
+#line 3067 "DataSource.c"
}
@@ -3076,7 +3079,7 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) {
result = _tmp0_;
#line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3079 "DataSource.c"
+#line 3082 "DataSource.c"
}
@@ -3086,7 +3089,7 @@ SourceSnapshot* source_snapshot_construct (GType object_type) {
self = (SourceSnapshot*) g_type_create_instance (object_type);
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return self;
-#line 3089 "DataSource.c"
+#line 3092 "DataSource.c"
}
@@ -3097,7 +3100,7 @@ static void source_snapshot_real_broken (SourceSnapshot* self) {
static void value_source_snapshot_init (GValue* value) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3100 "DataSource.c"
+#line 3103 "DataSource.c"
}
@@ -3106,7 +3109,7 @@ static void value_source_snapshot_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_snapshot_unref (value->data[0].v_pointer);
-#line 3109 "DataSource.c"
+#line 3112 "DataSource.c"
}
}
@@ -3116,11 +3119,11 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = source_snapshot_ref (src_value->data[0].v_pointer);
-#line 3119 "DataSource.c"
+#line 3122 "DataSource.c"
} else {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3123 "DataSource.c"
+#line 3126 "DataSource.c"
}
}
@@ -3128,37 +3131,37 @@ static void value_source_snapshot_copy_value (const GValue* src_value, GValue* d
static gpointer value_source_snapshot_peek_pointer (const GValue* value) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 3131 "DataSource.c"
+#line 3134 "DataSource.c"
}
static gchar* value_source_snapshot_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (collect_values[0].v_pointer) {
-#line 3138 "DataSource.c"
+#line 3141 "DataSource.c"
SourceSnapshot* object;
object = collect_values[0].v_pointer;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (object->parent_instance.g_class == NULL) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3145 "DataSource.c"
+#line 3148 "DataSource.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.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 3149 "DataSource.c"
+#line 3152 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = source_snapshot_ref (object);
-#line 3153 "DataSource.c"
+#line 3156 "DataSource.c"
} else {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3157 "DataSource.c"
+#line 3160 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 3161 "DataSource.c"
+#line 3164 "DataSource.c"
}
@@ -3169,25 +3172,25 @@ static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_co
if (!object_p) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3172 "DataSource.c"
+#line 3175 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!value->data[0].v_pointer) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = NULL;
-#line 3178 "DataSource.c"
+#line 3181 "DataSource.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = value->data[0].v_pointer;
-#line 3182 "DataSource.c"
+#line 3185 "DataSource.c"
} else {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = source_snapshot_ref (value->data[0].v_pointer);
-#line 3186 "DataSource.c"
+#line 3189 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 3190 "DataSource.c"
+#line 3193 "DataSource.c"
}
@@ -3201,7 +3204,7 @@ GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return G_PARAM_SPEC (spec);
-#line 3204 "DataSource.c"
+#line 3207 "DataSource.c"
}
@@ -3210,7 +3213,7 @@ gpointer value_get_source_snapshot (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_SNAPSHOT), NULL);
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 3213 "DataSource.c"
+#line 3216 "DataSource.c"
}
@@ -3230,17 +3233,17 @@ void value_set_source_snapshot (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_snapshot_ref (value->data[0].v_pointer);
-#line 3233 "DataSource.c"
+#line 3236 "DataSource.c"
} else {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3237 "DataSource.c"
+#line 3240 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_snapshot_unref (old);
-#line 3243 "DataSource.c"
+#line 3246 "DataSource.c"
}
}
@@ -3259,17 +3262,17 @@ void value_take_source_snapshot (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = v_object;
-#line 3262 "DataSource.c"
+#line 3265 "DataSource.c"
} else {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3266 "DataSource.c"
+#line 3269 "DataSource.c"
}
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_snapshot_unref (old);
-#line 3272 "DataSource.c"
+#line 3275 "DataSource.c"
}
}
@@ -3282,12 +3285,12 @@ static void source_snapshot_class_init (SourceSnapshotClass * klass) {
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_class_add_private (klass, sizeof (SourceSnapshotPrivate));
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((SourceSnapshotClass *) klass)->notify_broken = source_snapshot_real_notify_broken;
+ ((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) source_snapshot_real_notify_broken;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
((SourceSnapshotClass *) klass)->broken = source_snapshot_real_broken;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_new ("broken", TYPE_SOURCE_SNAPSHOT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceSnapshotClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3290 "DataSource.c"
+#line 3293 "DataSource.c"
}
@@ -3298,7 +3301,7 @@ static void source_snapshot_instance_init (SourceSnapshot * self) {
self->priv->snapshot_broken = FALSE;
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->ref_count = 1;
-#line 3301 "DataSource.c"
+#line 3304 "DataSource.c"
}
@@ -3308,7 +3311,7 @@ static void source_snapshot_finalize (SourceSnapshot* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SOURCE_SNAPSHOT, SourceSnapshot);
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_handlers_destroy (self);
-#line 3311 "DataSource.c"
+#line 3314 "DataSource.c"
}
@@ -3333,7 +3336,7 @@ gpointer source_snapshot_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return instance;
-#line 3336 "DataSource.c"
+#line 3339 "DataSource.c"
}
@@ -3346,7 +3349,7 @@ void source_snapshot_unref (gpointer instance) {
SOURCE_SNAPSHOT_GET_CLASS (self)->finalize (self);
#line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3349 "DataSource.c"
+#line 3352 "DataSource.c"
}
}
@@ -3370,7 +3373,7 @@ static gchar* string_strip (const gchar* self) {
result = _result_;
#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 3373 "DataSource.c"
+#line 3376 "DataSource.c"
}
@@ -3415,14 +3418,14 @@ SourceBacklink* source_backlink_construct (GType object_type, const gchar* name,
self->priv->_value = _tmp6_;
#line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return self;
-#line 3418 "DataSource.c"
+#line 3421 "DataSource.c"
}
SourceBacklink* source_backlink_new (const gchar* name, const gchar* value) {
#line 498 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return source_backlink_construct (TYPE_SOURCE_BACKLINK, name, value);
-#line 3425 "DataSource.c"
+#line 3428 "DataSource.c"
}
@@ -3484,14 +3487,14 @@ SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSo
_vala_assert (_tmp11_, "validate_name_value(_name, _value)");
#line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return self;
-#line 3487 "DataSource.c"
+#line 3490 "DataSource.c"
}
SourceBacklink* source_backlink_new_from_source (DataSource* source) {
#line 505 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return source_backlink_construct_from_source (TYPE_SOURCE_BACKLINK, source);
-#line 3494 "DataSource.c"
+#line 3497 "DataSource.c"
}
@@ -3511,7 +3514,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 3514 "DataSource.c"
+#line 3517 "DataSource.c"
}
@@ -3531,7 +3534,7 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
_tmp3_ = string_contains (_tmp2_, "=");
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!_tmp3_) {
-#line 3534 "DataSource.c"
+#line 3537 "DataSource.c"
const gchar* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3540,15 +3543,15 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
_tmp5_ = string_contains (_tmp4_, "|");
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = !_tmp5_;
-#line 3543 "DataSource.c"
+#line 3546 "DataSource.c"
} else {
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = FALSE;
-#line 3547 "DataSource.c"
+#line 3550 "DataSource.c"
}
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp1_) {
-#line 3551 "DataSource.c"
+#line 3554 "DataSource.c"
const gchar* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3557,17 +3560,17 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
_tmp7_ = string_contains (_tmp6_, "|");
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = !_tmp7_;
-#line 3560 "DataSource.c"
+#line 3563 "DataSource.c"
} else {
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = FALSE;
-#line 3564 "DataSource.c"
+#line 3567 "DataSource.c"
}
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
result = _tmp0_;
#line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3570 "DataSource.c"
+#line 3573 "DataSource.c"
}
@@ -3594,7 +3597,7 @@ gchar* source_backlink_to_string (SourceBacklink* self) {
result = _tmp4_;
#line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3597 "DataSource.c"
+#line 3600 "DataSource.c"
}
@@ -3630,7 +3633,7 @@ guint source_backlink_hash_func (SourceBacklink* backlink) {
result = _tmp3_ ^ _tmp7_;
#line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3633 "DataSource.c"
+#line 3636 "DataSource.c"
}
@@ -3661,7 +3664,7 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin
_tmp6_ = _tmp1_ (_tmp3_, _tmp5_);
#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp6_) {
-#line 3664 "DataSource.c"
+#line 3667 "DataSource.c"
GEqualFunc _tmp7_ = NULL;
SourceBacklink* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
@@ -3682,17 +3685,17 @@ gboolean source_backlink_equal_func (SourceBacklink* alink, SourceBacklink* blin
_tmp12_ = _tmp7_ (_tmp9_, _tmp11_);
#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = _tmp12_;
-#line 3685 "DataSource.c"
+#line 3688 "DataSource.c"
} else {
#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp0_ = FALSE;
-#line 3689 "DataSource.c"
+#line 3692 "DataSource.c"
}
#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
result = _tmp0_;
#line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3695 "DataSource.c"
+#line 3698 "DataSource.c"
}
@@ -3707,7 +3710,7 @@ const gchar* source_backlink_get_name (SourceBacklink* self) {
result = _tmp0_;
#line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3710 "DataSource.c"
+#line 3713 "DataSource.c"
}
@@ -3722,7 +3725,7 @@ const gchar* source_backlink_get_value (SourceBacklink* self) {
result = _tmp0_;
#line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3725 "DataSource.c"
+#line 3728 "DataSource.c"
}
@@ -3737,7 +3740,7 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) {
result = _tmp0_;
#line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3740 "DataSource.c"
+#line 3743 "DataSource.c"
}
@@ -3755,7 +3758,7 @@ static gint64 int64_parse (const gchar* str) {
result = _tmp1_;
#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 3758 "DataSource.c"
+#line 3761 "DataSource.c"
}
@@ -3773,14 +3776,14 @@ gint64 source_backlink_get_instance_id (SourceBacklink* self) {
result = _tmp1_;
#line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 3776 "DataSource.c"
+#line 3779 "DataSource.c"
}
static void value_source_backlink_init (GValue* value) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3783 "DataSource.c"
+#line 3786 "DataSource.c"
}
@@ -3789,7 +3792,7 @@ static void value_source_backlink_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_backlink_unref (value->data[0].v_pointer);
-#line 3792 "DataSource.c"
+#line 3795 "DataSource.c"
}
}
@@ -3799,11 +3802,11 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d
if (src_value->data[0].v_pointer) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = source_backlink_ref (src_value->data[0].v_pointer);
-#line 3802 "DataSource.c"
+#line 3805 "DataSource.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3806 "DataSource.c"
+#line 3809 "DataSource.c"
}
}
@@ -3811,37 +3814,37 @@ static void value_source_backlink_copy_value (const GValue* src_value, GValue* d
static gpointer value_source_backlink_peek_pointer (const GValue* value) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 3814 "DataSource.c"
+#line 3817 "DataSource.c"
}
static gchar* value_source_backlink_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (collect_values[0].v_pointer) {
-#line 3821 "DataSource.c"
+#line 3824 "DataSource.c"
SourceBacklink* object;
object = collect_values[0].v_pointer;
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (object->parent_instance.g_class == NULL) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3828 "DataSource.c"
+#line 3831 "DataSource.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.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 3832 "DataSource.c"
+#line 3835 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = source_backlink_ref (object);
-#line 3836 "DataSource.c"
+#line 3839 "DataSource.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3840 "DataSource.c"
+#line 3843 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 3844 "DataSource.c"
+#line 3847 "DataSource.c"
}
@@ -3852,25 +3855,25 @@ static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_co
if (!object_p) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3855 "DataSource.c"
+#line 3858 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!value->data[0].v_pointer) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = NULL;
-#line 3861 "DataSource.c"
+#line 3864 "DataSource.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = value->data[0].v_pointer;
-#line 3865 "DataSource.c"
+#line 3868 "DataSource.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = source_backlink_ref (value->data[0].v_pointer);
-#line 3869 "DataSource.c"
+#line 3872 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 3873 "DataSource.c"
+#line 3876 "DataSource.c"
}
@@ -3884,7 +3887,7 @@ GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return G_PARAM_SPEC (spec);
-#line 3887 "DataSource.c"
+#line 3890 "DataSource.c"
}
@@ -3893,7 +3896,7 @@ gpointer value_get_source_backlink (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_BACKLINK), NULL);
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 3896 "DataSource.c"
+#line 3899 "DataSource.c"
}
@@ -3913,17 +3916,17 @@ void value_set_source_backlink (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_backlink_ref (value->data[0].v_pointer);
-#line 3916 "DataSource.c"
+#line 3919 "DataSource.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3920 "DataSource.c"
+#line 3923 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_backlink_unref (old);
-#line 3926 "DataSource.c"
+#line 3929 "DataSource.c"
}
}
@@ -3942,17 +3945,17 @@ void value_take_source_backlink (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = v_object;
-#line 3945 "DataSource.c"
+#line 3948 "DataSource.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 3949 "DataSource.c"
+#line 3952 "DataSource.c"
}
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_backlink_unref (old);
-#line 3955 "DataSource.c"
+#line 3958 "DataSource.c"
}
}
@@ -3964,7 +3967,7 @@ static void source_backlink_class_init (SourceBacklinkClass * klass) {
((SourceBacklinkClass *) klass)->finalize = source_backlink_finalize;
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_class_add_private (klass, sizeof (SourceBacklinkPrivate));
-#line 3967 "DataSource.c"
+#line 3970 "DataSource.c"
}
@@ -3973,7 +3976,7 @@ static void source_backlink_instance_init (SourceBacklink * self) {
self->priv = SOURCE_BACKLINK_GET_PRIVATE (self);
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->ref_count = 1;
-#line 3976 "DataSource.c"
+#line 3979 "DataSource.c"
}
@@ -3987,7 +3990,7 @@ static void source_backlink_finalize (SourceBacklink* obj) {
_g_free0 (self->priv->_name);
#line 470 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_free0 (self->priv->_value);
-#line 3990 "DataSource.c"
+#line 3993 "DataSource.c"
}
@@ -4012,7 +4015,7 @@ gpointer source_backlink_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return instance;
-#line 4015 "DataSource.c"
+#line 4018 "DataSource.c"
}
@@ -4025,7 +4028,7 @@ void source_backlink_unref (gpointer instance) {
SOURCE_BACKLINK_GET_CLASS (self)->finalize (self);
#line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4028 "DataSource.c"
+#line 4031 "DataSource.c"
}
}
@@ -4033,14 +4036,14 @@ void source_backlink_unref (gpointer instance) {
static void _source_proxy_on_source_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
#line 588 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_on_source_added ((SourceProxy*) self, added);
-#line 4036 "DataSource.c"
+#line 4039 "DataSource.c"
}
static void _source_proxy_on_snapshot_broken_source_snapshot_broken (SourceSnapshot* _sender, gpointer self) {
#line 577 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_on_snapshot_broken ((SourceProxy*) self);
-#line 4043 "DataSource.c"
+#line 4046 "DataSource.c"
}
@@ -4115,7 +4118,7 @@ SourceProxy* source_proxy_construct (GType object_type, DataSource* source) {
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _source_proxy_on_source_added_data_collection_items_added, self);
#line 571 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return self;
-#line 4118 "DataSource.c"
+#line 4121 "DataSource.c"
}
@@ -4124,7 +4127,7 @@ static DataSource* source_proxy_real_reconstitute (SourceProxy* self, gint64 obj
g_critical ("Type `%s' does not implement abstract method `source_proxy_reconstitute'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 4127 "DataSource.c"
+#line 4130 "DataSource.c"
}
@@ -4133,7 +4136,7 @@ DataSource* source_proxy_reconstitute (SourceProxy* self, gint64 object_id, Sour
g_return_val_if_fail (IS_SOURCE_PROXY (self), NULL);
#line 591 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return SOURCE_PROXY_GET_CLASS (self)->reconstitute (self, object_id, snapshot);
-#line 4136 "DataSource.c"
+#line 4139 "DataSource.c"
}
@@ -4145,7 +4148,7 @@ static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSourc
_tmp0_ = source;
#line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_emit_by_name (self, "reconstituted", _tmp0_);
-#line 4148 "DataSource.c"
+#line 4151 "DataSource.c"
}
@@ -4154,14 +4157,14 @@ void source_proxy_notify_reconstituted (SourceProxy* self, DataSource* source) {
g_return_if_fail (IS_SOURCE_PROXY (self));
#line 593 "/home/jens/Source/shotwell/src/core/DataSource.vala"
SOURCE_PROXY_GET_CLASS (self)->notify_reconstituted (self, source);
-#line 4157 "DataSource.c"
+#line 4160 "DataSource.c"
}
static void source_proxy_real_notify_dehydrated (SourceProxy* self) {
#line 598 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_emit_by_name (self, "dehydrated");
-#line 4164 "DataSource.c"
+#line 4167 "DataSource.c"
}
@@ -4170,14 +4173,14 @@ void source_proxy_notify_dehydrated (SourceProxy* self) {
g_return_if_fail (IS_SOURCE_PROXY (self));
#line 597 "/home/jens/Source/shotwell/src/core/DataSource.vala"
SOURCE_PROXY_GET_CLASS (self)->notify_dehydrated (self);
-#line 4173 "DataSource.c"
+#line 4176 "DataSource.c"
}
static void source_proxy_real_notify_broken (SourceProxy* self) {
#line 602 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_emit_by_name (self, "broken");
-#line 4180 "DataSource.c"
+#line 4183 "DataSource.c"
}
@@ -4186,7 +4189,7 @@ void source_proxy_notify_broken (SourceProxy* self) {
g_return_if_fail (IS_SOURCE_PROXY (self));
#line 601 "/home/jens/Source/shotwell/src/core/DataSource.vala"
SOURCE_PROXY_GET_CLASS (self)->notify_broken (self);
-#line 4189 "DataSource.c"
+#line 4192 "DataSource.c"
}
@@ -4197,14 +4200,14 @@ static void source_proxy_on_snapshot_broken (SourceProxy* self) {
source_proxy_drop_source (self);
#line 608 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_notify_broken (self);
-#line 4200 "DataSource.c"
+#line 4203 "DataSource.c"
}
static void _source_proxy_on_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
#line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_on_destroyed ((SourceProxy*) self);
-#line 4207 "DataSource.c"
+#line 4210 "DataSource.c"
}
@@ -4230,7 +4233,7 @@ static void source_proxy_set_source (SourceProxy* self, DataSource* source) {
_tmp2_ = source;
#line 615 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_connect (_tmp2_, "destroyed", (GCallback) _source_proxy_on_destroyed_data_source_destroyed, self);
-#line 4233 "DataSource.c"
+#line 4236 "DataSource.c"
}
@@ -4246,7 +4249,7 @@ static void source_proxy_drop_source (SourceProxy* self) {
if (_tmp0_ == NULL) {
#line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return;
-#line 4249 "DataSource.c"
+#line 4252 "DataSource.c"
}
#line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp1_ = self->priv->source;
@@ -4258,7 +4261,7 @@ static void source_proxy_drop_source (SourceProxy* self) {
_g_object_unref0 (self->priv->source);
#line 623 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->source = NULL;
-#line 4261 "DataSource.c"
+#line 4264 "DataSource.c"
}
@@ -4296,13 +4299,13 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
result = NULL;
#line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 4299 "DataSource.c"
+#line 4302 "DataSource.c"
}
#line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp2_ = self->priv->source;
#line 630 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp2_ != NULL) {
-#line 4305 "DataSource.c"
+#line 4308 "DataSource.c"
DataSource* _tmp3_ = NULL;
DataSource* _tmp4_ = NULL;
#line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4313,7 +4316,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
result = _tmp4_;
#line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 4316 "DataSource.c"
+#line 4319 "DataSource.c"
}
#line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = self->priv->object_id;
@@ -4329,7 +4332,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
_tmp9_ = new_source;
#line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp8_ != _tmp9_) {
-#line 4332 "DataSource.c"
+#line 4335 "DataSource.c"
DataSource* _tmp10_ = NULL;
DataSource* _tmp11_ = NULL;
#line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4340,7 +4343,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
_g_object_unref0 (self->priv->source);
#line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->source = _tmp11_;
-#line 4343 "DataSource.c"
+#line 4346 "DataSource.c"
}
#line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp12_ = self->priv->object_id;
@@ -4350,7 +4353,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
_tmp14_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
#line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (_tmp12_ != _tmp14_) {
-#line 4353 "DataSource.c"
+#line 4356 "DataSource.c"
DataSource* _tmp15_ = NULL;
gint64 _tmp16_ = 0LL;
#line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4359,7 +4362,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
_tmp16_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
#line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->priv->object_id = _tmp16_;
-#line 4362 "DataSource.c"
+#line 4365 "DataSource.c"
}
#line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp17_ = self->priv->source;
@@ -4387,7 +4390,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
_g_object_unref0 (new_source);
#line 644 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return result;
-#line 4390 "DataSource.c"
+#line 4393 "DataSource.c"
}
@@ -4403,7 +4406,7 @@ static void source_proxy_on_destroyed (SourceProxy* self) {
source_proxy_drop_source (self);
#line 653 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_notify_dehydrated (self);
-#line 4406 "DataSource.c"
+#line 4409 "DataSource.c"
}
@@ -4419,7 +4422,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
if (_tmp0_ != NULL) {
#line 659 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return;
-#line 4422 "DataSource.c"
+#line 4425 "DataSource.c"
}
{
GeeIterator* _object_it = NULL;
@@ -4433,7 +4436,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
_object_it = _tmp2_;
#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
while (TRUE) {
-#line 4436 "DataSource.c"
+#line 4439 "DataSource.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
DataObject* object = NULL;
@@ -4452,7 +4455,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
if (!_tmp4_) {
#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 4455 "DataSource.c"
+#line 4458 "DataSource.c"
}
#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp5_ = _object_it;
@@ -4472,7 +4475,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
_g_object_unref0 (object);
#line 664 "/home/jens/Source/shotwell/src/core/DataSource.vala"
continue;
-#line 4475 "DataSource.c"
+#line 4478 "DataSource.c"
}
#line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_tmp10_ = object;
@@ -4486,11 +4489,11 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
_g_object_unref0 (object);
#line 671 "/home/jens/Source/shotwell/src/core/DataSource.vala"
break;
-#line 4489 "DataSource.c"
+#line 4492 "DataSource.c"
}
#line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_g_object_unref0 (_object_it);
-#line 4493 "DataSource.c"
+#line 4496 "DataSource.c"
}
}
@@ -4498,7 +4501,7 @@ static void source_proxy_on_source_added (SourceProxy* self, GeeIterable* added)
static void source_proxy_real_reconstituted (SourceProxy* self, DataSource* source) {
#line 558 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_return_if_fail (IS_DATA_SOURCE (source));
-#line 4501 "DataSource.c"
+#line 4504 "DataSource.c"
}
@@ -4513,7 +4516,7 @@ static void source_proxy_real_broken (SourceProxy* self) {
static void value_source_proxy_init (GValue* value) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 4516 "DataSource.c"
+#line 4519 "DataSource.c"
}
@@ -4522,7 +4525,7 @@ static void value_source_proxy_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_unref (value->data[0].v_pointer);
-#line 4525 "DataSource.c"
+#line 4528 "DataSource.c"
}
}
@@ -4532,11 +4535,11 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest
if (src_value->data[0].v_pointer) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = source_proxy_ref (src_value->data[0].v_pointer);
-#line 4535 "DataSource.c"
+#line 4538 "DataSource.c"
} else {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4539 "DataSource.c"
+#line 4542 "DataSource.c"
}
}
@@ -4544,37 +4547,37 @@ static void value_source_proxy_copy_value (const GValue* src_value, GValue* dest
static gpointer value_source_proxy_peek_pointer (const GValue* value) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 4547 "DataSource.c"
+#line 4550 "DataSource.c"
}
static gchar* value_source_proxy_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (collect_values[0].v_pointer) {
-#line 4554 "DataSource.c"
+#line 4557 "DataSource.c"
SourceProxy* object;
object = collect_values[0].v_pointer;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (object->parent_instance.g_class == NULL) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4561 "DataSource.c"
+#line 4564 "DataSource.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.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 4565 "DataSource.c"
+#line 4568 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = source_proxy_ref (object);
-#line 4569 "DataSource.c"
+#line 4572 "DataSource.c"
} else {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 4573 "DataSource.c"
+#line 4576 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 4577 "DataSource.c"
+#line 4580 "DataSource.c"
}
@@ -4585,25 +4588,25 @@ static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_colle
if (!object_p) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4588 "DataSource.c"
+#line 4591 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (!value->data[0].v_pointer) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = NULL;
-#line 4594 "DataSource.c"
+#line 4597 "DataSource.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = value->data[0].v_pointer;
-#line 4598 "DataSource.c"
+#line 4601 "DataSource.c"
} else {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
*object_p = source_proxy_ref (value->data[0].v_pointer);
-#line 4602 "DataSource.c"
+#line 4605 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return NULL;
-#line 4606 "DataSource.c"
+#line 4609 "DataSource.c"
}
@@ -4617,7 +4620,7 @@ GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return G_PARAM_SPEC (spec);
-#line 4620 "DataSource.c"
+#line 4623 "DataSource.c"
}
@@ -4626,7 +4629,7 @@ gpointer value_get_source_proxy (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SOURCE_PROXY), NULL);
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return value->data[0].v_pointer;
-#line 4629 "DataSource.c"
+#line 4632 "DataSource.c"
}
@@ -4646,17 +4649,17 @@ void value_set_source_proxy (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_ref (value->data[0].v_pointer);
-#line 4649 "DataSource.c"
+#line 4652 "DataSource.c"
} else {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 4653 "DataSource.c"
+#line 4656 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_unref (old);
-#line 4659 "DataSource.c"
+#line 4662 "DataSource.c"
}
}
@@ -4675,17 +4678,17 @@ void value_take_source_proxy (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = v_object;
-#line 4678 "DataSource.c"
+#line 4681 "DataSource.c"
} else {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
value->data[0].v_pointer = NULL;
-#line 4682 "DataSource.c"
+#line 4685 "DataSource.c"
}
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
if (old) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
source_proxy_unref (old);
-#line 4688 "DataSource.c"
+#line 4691 "DataSource.c"
}
}
@@ -4698,13 +4701,13 @@ static void source_proxy_class_init (SourceProxyClass * klass) {
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_class_add_private (klass, sizeof (SourceProxyPrivate));
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((SourceProxyClass *) klass)->reconstitute = source_proxy_real_reconstitute;
+ ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) source_proxy_real_reconstitute;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((SourceProxyClass *) klass)->notify_reconstituted = source_proxy_real_notify_reconstituted;
+ ((SourceProxyClass *) klass)->notify_reconstituted = (void (*)(SourceProxy*, DataSource*)) source_proxy_real_notify_reconstituted;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((SourceProxyClass *) klass)->notify_dehydrated = source_proxy_real_notify_dehydrated;
+ ((SourceProxyClass *) klass)->notify_dehydrated = (void (*)(SourceProxy*)) source_proxy_real_notify_dehydrated;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
- ((SourceProxyClass *) klass)->notify_broken = source_proxy_real_notify_broken;
+ ((SourceProxyClass *) klass)->notify_broken = (void (*)(SourceProxy*)) source_proxy_real_notify_broken;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
((SourceProxyClass *) klass)->reconstituted = source_proxy_real_reconstituted;
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4717,7 +4720,7 @@ static void source_proxy_class_init (SourceProxyClass * klass) {
g_signal_new ("dehydrated", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, dehydrated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_signal_new ("broken", TYPE_SOURCE_PROXY, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SourceProxyClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4720 "DataSource.c"
+#line 4723 "DataSource.c"
}
@@ -4726,7 +4729,7 @@ static void source_proxy_instance_init (SourceProxy * self) {
self->priv = SOURCE_PROXY_GET_PRIVATE (self);
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
self->ref_count = 1;
-#line 4729 "DataSource.c"
+#line 4732 "DataSource.c"
}
@@ -4754,7 +4757,7 @@ static void source_proxy_finalize (SourceProxy* obj) {
_source_snapshot_unref0 (self->priv->snapshot);
#line 554 "/home/jens/Source/shotwell/src/core/DataSource.vala"
_data_collection_unref0 (self->priv->membership);
-#line 4757 "DataSource.c"
+#line 4760 "DataSource.c"
}
@@ -4779,7 +4782,7 @@ gpointer source_proxy_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return instance;
-#line 4782 "DataSource.c"
+#line 4785 "DataSource.c"
}
@@ -4792,7 +4795,7 @@ void source_proxy_unref (gpointer instance) {
SOURCE_PROXY_GET_CLASS (self)->finalize (self);
#line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4795 "DataSource.c"
+#line 4798 "DataSource.c"
}
}
@@ -4802,7 +4805,7 @@ SourceProxy* proxyable_get_proxy (Proxyable* self) {
g_return_val_if_fail (IS_PROXYABLE (self), NULL);
#line 677 "/home/jens/Source/shotwell/src/core/DataSource.vala"
return PROXYABLE_GET_INTERFACE (self)->get_proxy (self);
-#line 4805 "DataSource.c"
+#line 4808 "DataSource.c"
}
@@ -4813,7 +4816,7 @@ static void proxyable_base_init (ProxyableIface * iface) {
if (!initialized) {
#line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala"
initialized = TRUE;
-#line 4816 "DataSource.c"
+#line 4819 "DataSource.c"
}
}
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index ea7d98a..a71a3c3 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.34.4, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.34.7, the Vala compiler
* generated from DataSourceTypes.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -727,15 +727,15 @@ static void thumbnail_source_class_init (ThumbnailSourceClass * klass) {
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
thumbnail_source_parent_class = g_type_class_peek_parent (klass);
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = thumbnail_source_real_notify_thumbnail_altered;
+ ((ThumbnailSourceClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailSource*)) thumbnail_source_real_notify_thumbnail_altered;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((ThumbnailSourceClass *) klass)->get_thumbnail = thumbnail_source_real_get_thumbnail;
+ ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_get_thumbnail;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((ThumbnailSourceClass *) klass)->create_thumbnail = thumbnail_source_real_create_thumbnail;
+ ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) thumbnail_source_real_create_thumbnail;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((ThumbnailSourceClass *) klass)->get_representative_id = thumbnail_source_real_get_representative_id;
+ ((ThumbnailSourceClass *) klass)->get_representative_id = (gchar* (*)(ThumbnailSource*)) thumbnail_source_real_get_representative_id;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = thumbnail_source_real_get_preferred_thumbnail_format;
+ ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) thumbnail_source_real_get_preferred_thumbnail_format;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
((ThumbnailSourceClass *) klass)->thumbnail_altered = thumbnail_source_real_thumbnail_altered;
#line 11 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
@@ -813,9 +813,9 @@ static void photo_source_class_init (PhotoSourceClass * klass) {
#line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
photo_source_parent_class = g_type_class_peek_parent (klass);
#line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((PhotoSourceClass *) klass)->get_metadata = photo_source_real_get_metadata;
+ ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_source_real_get_metadata;
#line 53 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((PhotoSourceClass *) klass)->get_pixbuf = photo_source_real_get_pixbuf;
+ ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_source_real_get_pixbuf;
#line 820 "DataSourceTypes.c"
}
@@ -883,11 +883,12 @@ EventSource* event_source_construct (GType object_type, gint64 object_id) {
static time_t event_source_real_get_start_time (EventSource* self) {
+ time_t _tmp0_ = 0;
#line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
g_critical ("Type `%s' does not implement abstract method `event_source_get_start_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- return 0;
-#line 891 "DataSourceTypes.c"
+ return _tmp0_;
+#line 892 "DataSourceTypes.c"
}
@@ -896,16 +897,17 @@ time_t event_source_get_start_time (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
#line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_start_time (self);
-#line 900 "DataSourceTypes.c"
+#line 901 "DataSourceTypes.c"
}
static time_t event_source_real_get_end_time (EventSource* self) {
+ time_t _tmp0_ = 0;
#line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
g_critical ("Type `%s' does not implement abstract method `event_source_get_end_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- return 0;
-#line 909 "DataSourceTypes.c"
+ return _tmp0_;
+#line 911 "DataSourceTypes.c"
}
@@ -914,16 +916,17 @@ time_t event_source_get_end_time (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
#line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_end_time (self);
-#line 918 "DataSourceTypes.c"
+#line 920 "DataSourceTypes.c"
}
static guint64 event_source_real_get_total_filesize (EventSource* self) {
+ guint64 _tmp0_ = 0ULL;
#line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
g_critical ("Type `%s' does not implement abstract method `event_source_get_total_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- return 0ULL;
-#line 927 "DataSourceTypes.c"
+ return _tmp0_;
+#line 930 "DataSourceTypes.c"
}
@@ -932,16 +935,17 @@ guint64 event_source_get_total_filesize (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), 0ULL);
#line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_total_filesize (self);
-#line 936 "DataSourceTypes.c"
+#line 939 "DataSourceTypes.c"
}
static gint event_source_real_get_media_count (EventSource* self) {
+ gint _tmp0_ = 0;
#line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
g_critical ("Type `%s' does not implement abstract method `event_source_get_media_count'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- return 0;
-#line 945 "DataSourceTypes.c"
+ return _tmp0_;
+#line 949 "DataSourceTypes.c"
}
@@ -950,7 +954,7 @@ gint event_source_get_media_count (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), 0);
#line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_media_count (self);
-#line 954 "DataSourceTypes.c"
+#line 958 "DataSourceTypes.c"
}
@@ -959,7 +963,7 @@ static GeeCollection* event_source_real_get_media (EventSource* self) {
g_critical ("Type `%s' does not implement abstract method `event_source_get_media'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return NULL;
-#line 963 "DataSourceTypes.c"
+#line 967 "DataSourceTypes.c"
}
@@ -968,7 +972,7 @@ GeeCollection* event_source_get_media (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL);
#line 83 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_media (self);
-#line 972 "DataSourceTypes.c"
+#line 976 "DataSourceTypes.c"
}
@@ -977,7 +981,7 @@ static gchar* event_source_real_get_comment (EventSource* self) {
g_critical ("Type `%s' does not implement abstract method `event_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return NULL;
-#line 981 "DataSourceTypes.c"
+#line 985 "DataSourceTypes.c"
}
@@ -986,16 +990,17 @@ gchar* event_source_get_comment (EventSource* self) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), NULL);
#line 85 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->get_comment (self);
-#line 990 "DataSourceTypes.c"
+#line 994 "DataSourceTypes.c"
}
static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment) {
+ gboolean _tmp0_ = FALSE;
#line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
g_critical ("Type `%s' does not implement abstract method `event_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- return FALSE;
-#line 999 "DataSourceTypes.c"
+ return _tmp0_;
+#line 1004 "DataSourceTypes.c"
}
@@ -1004,7 +1009,7 @@ gboolean event_source_set_comment (EventSource* self, const gchar* comment) {
g_return_val_if_fail (IS_EVENT_SOURCE (self), FALSE);
#line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return EVENT_SOURCE_GET_CLASS (self)->set_comment (self, comment);
-#line 1008 "DataSourceTypes.c"
+#line 1013 "DataSourceTypes.c"
}
@@ -1012,20 +1017,20 @@ static void event_source_class_init (EventSourceClass * klass) {
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
event_source_parent_class = g_type_class_peek_parent (klass);
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_start_time = event_source_real_get_start_time;
+ ((EventSourceClass *) klass)->get_start_time = (time_t (*)(EventSource*)) event_source_real_get_start_time;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_end_time = event_source_real_get_end_time;
+ ((EventSourceClass *) klass)->get_end_time = (time_t (*)(EventSource*)) event_source_real_get_end_time;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_total_filesize = event_source_real_get_total_filesize;
+ ((EventSourceClass *) klass)->get_total_filesize = (guint64 (*)(EventSource*)) event_source_real_get_total_filesize;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_media_count = event_source_real_get_media_count;
+ ((EventSourceClass *) klass)->get_media_count = (gint (*)(EventSource*)) event_source_real_get_media_count;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_media = event_source_real_get_media;
+ ((EventSourceClass *) klass)->get_media = (GeeCollection* (*)(EventSource*)) event_source_real_get_media;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->get_comment = event_source_real_get_comment;
+ ((EventSourceClass *) klass)->get_comment = (gchar* (*)(EventSource*)) event_source_real_get_comment;
#line 70 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
- ((EventSourceClass *) klass)->set_comment = event_source_real_set_comment;
-#line 1029 "DataSourceTypes.c"
+ ((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_source_real_set_comment;
+#line 1034 "DataSourceTypes.c"
}
@@ -1050,7 +1055,7 @@ gboolean container_source_has_links (ContainerSource* self) {
g_return_val_if_fail (IS_CONTAINER_SOURCE (self), FALSE);
#line 95 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return CONTAINER_SOURCE_GET_INTERFACE (self)->has_links (self);
-#line 1054 "DataSourceTypes.c"
+#line 1059 "DataSourceTypes.c"
}
@@ -1059,7 +1064,7 @@ SourceBacklink* container_source_get_backlink (ContainerSource* self) {
g_return_val_if_fail (IS_CONTAINER_SOURCE (self), NULL);
#line 97 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
return CONTAINER_SOURCE_GET_INTERFACE (self)->get_backlink (self);
-#line 1063 "DataSourceTypes.c"
+#line 1068 "DataSourceTypes.c"
}
@@ -1068,7 +1073,7 @@ void container_source_break_link (ContainerSource* self, DataSource* source) {
g_return_if_fail (IS_CONTAINER_SOURCE (self));
#line 99 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
CONTAINER_SOURCE_GET_INTERFACE (self)->break_link (self, source);
-#line 1072 "DataSourceTypes.c"
+#line 1077 "DataSourceTypes.c"
}
@@ -1077,7 +1082,7 @@ void container_source_break_link_many (ContainerSource* self, GeeCollection* sou
g_return_if_fail (IS_CONTAINER_SOURCE (self));
#line 101 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
CONTAINER_SOURCE_GET_INTERFACE (self)->break_link_many (self, sources);
-#line 1081 "DataSourceTypes.c"
+#line 1086 "DataSourceTypes.c"
}
@@ -1086,7 +1091,7 @@ void container_source_establish_link (ContainerSource* self, DataSource* source)
g_return_if_fail (IS_CONTAINER_SOURCE (self));
#line 103 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link (self, source);
-#line 1090 "DataSourceTypes.c"
+#line 1095 "DataSourceTypes.c"
}
@@ -1095,7 +1100,7 @@ void container_source_establish_link_many (ContainerSource* self, GeeCollection*
g_return_if_fail (IS_CONTAINER_SOURCE (self));
#line 105 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
CONTAINER_SOURCE_GET_INTERFACE (self)->establish_link_many (self, sources);
-#line 1099 "DataSourceTypes.c"
+#line 1104 "DataSourceTypes.c"
}
@@ -1106,7 +1111,7 @@ static void container_source_base_init (ContainerSourceIface * iface) {
if (!initialized) {
#line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
initialized = TRUE;
-#line 1110 "DataSourceTypes.c"
+#line 1115 "DataSourceTypes.c"
}
}
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 2e70156..b25fa1e 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.34.4, the Vala compiler
+/* DataView.c generated by valac 0.34.7, the Vala compiler
* generated from DataView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -603,15 +603,15 @@ static void data_view_class_init (DataViewClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
g_type_class_add_private (klass, sizeof (DataViewPrivate));
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
- ((DataObjectClass *) klass)->get_name = data_view_real_get_name;
+ ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_view_real_get_name;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
- ((DataObjectClass *) klass)->to_string = data_view_real_to_string;
+ ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_view_real_to_string;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
- ((DataViewClass *) klass)->notify_view_altered = data_view_real_notify_view_altered;
+ ((DataViewClass *) klass)->notify_view_altered = (void (*)(DataView*)) data_view_real_notify_view_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
- ((DataViewClass *) klass)->notify_geometry_altered = data_view_real_notify_geometry_altered;
+ ((DataViewClass *) klass)->notify_geometry_altered = (void (*)(DataView*)) data_view_real_notify_geometry_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
- ((DataViewClass *) klass)->notify_unsubscribed = data_view_real_notify_unsubscribed;
+ ((DataViewClass *) klass)->notify_unsubscribed = (void (*)(DataView*, DataSource*)) data_view_real_notify_unsubscribed;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
((DataViewClass *) klass)->state_changed = data_view_real_state_changed;
#line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 355700d..806bca2 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.34.4, the Vala compiler
+/* DataViewTypes.c generated by valac 0.34.7, the Vala compiler
* generated from DataViewTypes.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -338,7 +338,7 @@ static void thumbnail_view_class_init (ThumbnailViewClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
thumbnail_view_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
- ((ThumbnailViewClass *) klass)->notify_thumbnail_altered = thumbnail_view_real_notify_thumbnail_altered;
+ ((ThumbnailViewClass *) klass)->notify_thumbnail_altered = (void (*)(ThumbnailView*)) thumbnail_view_real_notify_thumbnail_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
((ThumbnailViewClass *) klass)->thumbnail_altered = thumbnail_view_real_thumbnail_altered;
#line 7 "/home/jens/Source/shotwell/src/core/DataViewTypes.vala"
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index 0de87db..d21ab1b 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.34.4, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.34.7, the Vala compiler
* generated from DatabaseSourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -605,9 +605,9 @@ static void database_source_collection_class_init (DatabaseSourceCollectionClass
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_type_class_add_private (klass, sizeof (DatabaseSourceCollectionPrivate));
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_added = database_source_collection_real_notify_items_added;
+ ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_added;
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((DataCollectionClass *) klass)->notify_items_removed = database_source_collection_real_notify_items_removed;
+ ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) database_source_collection_real_notify_items_removed;
#line 612 "DatabaseSourceCollection.c"
}
@@ -617,7 +617,7 @@ static void database_source_collection_instance_init (DatabaseSourceCollection *
#line 15 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv = DATABASE_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv->map = _tmp0_;
#line 624 "DatabaseSourceCollection.c"
@@ -870,7 +870,7 @@ static void database_source_holding_tank_class_init (DatabaseSourceHoldingTankCl
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
g_type_class_add_private (klass, sizeof (DatabaseSourceHoldingTankPrivate));
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- ((SourceHoldingTankClass *) klass)->notify_contents_altered = database_source_holding_tank_real_notify_contents_altered;
+ ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) database_source_holding_tank_real_notify_contents_altered;
#line 875 "DatabaseSourceCollection.c"
}
@@ -880,7 +880,7 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan
#line 55 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv = DATABASE_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
#line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
- _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
self->priv->map = _tmp0_;
#line 887 "DatabaseSourceCollection.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"
}
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index eaf1815..1203f72 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.34.4, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.34.7, the Vala compiler
* generated from SourceHoldingTank.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1175,7 +1175,7 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp7_ = source;
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp7_);
+ _tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp7_);
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp9_ = _tmp8_;
#line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1298,7 +1298,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp20_ = source;
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp20_);
+ _tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp20_);
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp22_ = _tmp21_;
#line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1338,7 +1338,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
#line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp0_ = self->priv->relinks;
#line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_tmp2_ = _tmp1_;
#line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1354,7 +1354,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
#line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
copy = _tmp4_;
#line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp5_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp5_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
_g_object_unref0 (self->priv->relinks);
#line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1618,7 +1618,7 @@ static void source_holding_tank_class_init (SourceHoldingTankClass * klass) {
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
g_type_class_add_private (klass, sizeof (SourceHoldingTankPrivate));
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- ((SourceHoldingTankClass *) klass)->notify_contents_altered = source_holding_tank_real_notify_contents_altered;
+ ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) source_holding_tank_real_notify_contents_altered;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
((SourceHoldingTankClass *) klass)->contents_altered = source_holding_tank_real_contents_altered;
#line 24 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1638,11 +1638,11 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) {
#line 30 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
self->priv->tank = _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp1_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 31 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
self->priv->relinks = _tmp1_;
#line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
- _tmp2_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp2_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
self->priv->unlinking = _tmp2_;
#line 33 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index 1b3292d..f65f3e2 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.34.7, the Vala compiler
* generated from SourceInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index 4a340ab..93794c0 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.34.4, the Vala compiler
+/* Tracker.c generated by valac 0.34.7, the Vala compiler
* generated from Tracker.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
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"
}
}
diff --git a/src/core/util.c b/src/core/util.c
index e398d67..0ddab1f 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.34.4, the Vala compiler
+/* util.c generated by valac 0.34.7, the Vala compiler
* generated from util.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -279,7 +279,7 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_
gconstpointer _tmp0_ = NULL;
gpointer _tmp1_ = NULL;
#line 65 "/home/jens/Source/shotwell/src/core/util.vala"
- self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func);
+ self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func);
#line 65 "/home/jens/Source/shotwell/src/core/util.vala"
self->priv->g_type = g_type;
#line 65 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -360,7 +360,7 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b
#line 87 "/home/jens/Source/shotwell/src/core/util.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLETON_COLLECTION, SingletonCollection);
#line 88 "/home/jens/Source/shotwell/src/core/util.vala"
- _tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, self);
+ _tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, self);
#line 88 "/home/jens/Source/shotwell/src/core/util.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator);
#line 88 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -834,15 +834,15 @@ static void singleton_collection_class_init (SingletonCollectionClass * klass) {
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
g_type_class_add_private (klass, sizeof (SingletonCollectionPrivate));
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
- ((GeeAbstractCollectionClass *) klass)->add = singleton_collection_real_add;
+ ((GeeAbstractCollectionClass *) klass)->add = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_add;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
- ((GeeAbstractCollectionClass *) klass)->clear = singleton_collection_real_clear;
+ ((GeeAbstractCollectionClass *) klass)->clear = (void (*)(GeeAbstractCollection*)) singleton_collection_real_clear;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
- ((GeeAbstractCollectionClass *) klass)->contains = singleton_collection_real_contains;
+ ((GeeAbstractCollectionClass *) klass)->contains = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_contains;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
- ((GeeAbstractCollectionClass *) klass)->iterator = singleton_collection_real_iterator;
+ ((GeeAbstractCollectionClass *) klass)->iterator = (GeeIterator* (*)(GeeAbstractCollection*)) singleton_collection_real_iterator;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
- ((GeeAbstractCollectionClass *) klass)->remove = singleton_collection_real_remove;
+ ((GeeAbstractCollectionClass *) klass)->remove = (gboolean (*)(GeeAbstractCollection*, gconstpointer)) singleton_collection_real_remove;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
GEE_ABSTRACT_COLLECTION_CLASS (klass)->get_read_only = singleton_collection_real_get_read_only;
#line 13 "/home/jens/Source/shotwell/src/core/util.vala"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:41:57 +0000