summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-29 23:25:59 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-29 23:25:59 +0200
commit6944ad9f9346341ee0fd120ec3ed0b7b56406436 (patch)
treeae59422da384a9463c306e1983be5ac46ff97c7d /src/core
parent803e11e1c311a7ba4923d8d438eafa7ff62b463d (diff)
parent72e3d4c55a6569d966059f762824c38d06055871 (diff)
Merge tag 'upstream/0.25.0'
Upstream version 0.25.0
Diffstat (limited to 'src/core')
-rw-r--r--src/core/DataSource.c8
-rw-r--r--src/core/SourceCollection.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index fca0c0a..a1d692d 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 __catch47_g_error;
+ goto __catch48_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 __finally47;
- __catch47_g_error:
+ goto __finally48;
+ __catch48_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"
}
- __finally47:
+ __finally48:
#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 fc92bbd..9d54b3c 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 __catch46_g_error;
+ goto __catch47_g_error;
}
#line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
success = _tmp0_;
#line 765 "SourceCollection.c"
}
- goto __finally46;
- __catch46_g_error:
+ goto __finally47;
+ __catch47_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"
}
- __finally46:
+ __finally47:
#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"