diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
| commit | 8e1c5a834469d804d28ee8ab2cbe2da8e600a789 (patch) | |
| tree | b9771456583eaead893cfd8f02e680b58a3da970 /src/core | |
| parent | 80a5f2d8b095e895a5424f90b2ce4684d94c1a32 (diff) | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
Merge tag 'upstream/0.26.0'
Upstream version 0.26.0
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/DataSource.c | 8 | ||||
| -rw-r--r-- | src/core/SourceCollection.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/DataSource.c b/src/core/DataSource.c index 3009d24..4d1d881 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -2387,7 +2387,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 2389 "DataSource.c" - goto __catch49_g_error; + goto __catch50_g_error; } #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala" ret = _tmp1_; @@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) #line 2409 "DataSource.c" } } - goto __finally49; - __catch49_g_error: + goto __finally50; + __catch50_g_error: { GError* err = NULL; gchar* _tmp6_ = NULL; @@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing) _g_error_free0 (err); #line 2440 "DataSource.c" } - __finally49: + __finally50: #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 3cca952..edda651 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -757,14 +757,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 760 "SourceCollection.c" - goto __catch48_g_error; + goto __catch49_g_error; } #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" success = _tmp0_; #line 765 "SourceCollection.c" } - goto __finally48; - __catch48_g_error: + goto __finally49; + __catch49_g_error: { GError* err = NULL; #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -777,7 +777,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s _g_error_free0 (err); #line 779 "SourceCollection.c" } - __finally48: + __finally49: #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" |