From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/core/DataSource.c | 687 +++++++++++++++++++++++++------------------------- 1 file changed, 345 insertions(+), 342 deletions(-) (limited to 'src/core/DataSource.c') 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" } } -- cgit v1.2.3