diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/core | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/DataSource.c | 14 | ||||
| -rw-r--r-- | src/core/SourceCollection.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/DataSource.c b/src/core/DataSource.c index dc02548..dab0d7b 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -425,7 +425,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source); gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing); void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked); void data_source_internal_subscribe (DataSource* self, DataView* view); -static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value); +static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value); void data_source_internal_unsubscribe (DataSource* self, DataView* view); void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target); static void data_source_real_unlinked (DataSource* self, SourceCollection* sources); @@ -2407,7 +2407,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2409 "DataSource.c" - goto __catch50_g_error; + goto __catch54_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = _tmp1_; @@ -2429,8 +2429,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) #line 2429 "DataSource.c" } } - goto __finally50; - __catch50_g_error: + goto __finally54; + __catch54_g_error: { GError* err = NULL; gchar* _tmp6_; @@ -2459,7 +2459,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _g_error_free0 (err); #line 2460 "DataSource.c" } - __finally50: + __finally54: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2465 "DataSource.c" @@ -2497,7 +2497,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) } -static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value) { +static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" if ((*length) == (*size)) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -2621,7 +2621,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) { #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala" _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_); + _vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_); #line 2625 "DataSource.c" } diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 0e96c86..6742476 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -768,14 +768,14 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 771 "SourceCollection.c" - goto __catch49_g_error; + goto __catch53_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; #line 776 "SourceCollection.c" } - goto __finally49; - __catch49_g_error: + goto __finally53; + __catch53_g_error: { GError* err = NULL; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -788,7 +788,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _g_error_free0 (err); #line 790 "SourceCollection.c" } - __finally49: + __finally53: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 795 "SourceCollection.c" |