summaryrefslogtreecommitdiff
path: root/src/MetadataWriter.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
commitccff5442184e84d511c2bd25ed3da53e4336a272 (patch)
tree8402a0ba68852e0aec5841ed4519ccfe88352223 /src/MetadataWriter.c
parenta1e1833f48ed618273dab9198b547148a89832a7 (diff)
parent4a3f1fdfe1eb3743564adcee35d5513224339260 (diff)
Merge tag 'upstream/0.25.1'
Upstream version 0.25.1
Diffstat (limited to 'src/MetadataWriter.c')
-rw-r--r--src/MetadataWriter.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 06e98f4..259175f 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -2958,7 +2958,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
#line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
_g_object_unref0 (_photo_it);
#line 2961 "MetadataWriter.c"
- goto __catch554_g_error;
+ goto __catch551_g_error;
}
#line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
_g_object_unref0 (photo);
@@ -2978,8 +2978,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
transaction_controller_commit (_tmp23_);
#line 2980 "MetadataWriter.c"
}
- goto __finally554;
- __catch554_g_error:
+ goto __finally551;
+ __catch551_g_error:
{
GError* err = NULL;
GError* _tmp24_ = NULL;
@@ -3013,7 +3013,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
_g_error_free0 (err);
#line 3015 "MetadataWriter.c"
}
- __finally554:
+ __finally551:
#line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3796,7 +3796,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
#line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3799 "MetadataWriter.c"
- goto __catch555_database_error;
+ goto __catch552_database_error;
}
{
LibraryPhoto* _tmp67_ = NULL;
@@ -3853,7 +3853,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
#line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3856 "MetadataWriter.c"
- goto __catch555_database_error;
+ goto __catch552_database_error;
}
{
LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
}
}
}
- goto __finally555;
- __catch555_database_error:
+ goto __finally552;
+ __catch552_database_error:
{
GError* err = NULL;
GError* _tmp79_ = NULL;
@@ -3902,7 +3902,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
_g_error_free0 (err);
#line 3904 "MetadataWriter.c"
}
- __finally555:
+ __finally552:
{
LibraryPhoto* _tmp80_ = NULL;
MetadataWriterCommitJob* _tmp81_ = NULL;
@@ -3949,7 +3949,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
#line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3952 "MetadataWriter.c"
- goto __catch556_database_error;
+ goto __catch553_database_error;
}
#line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
_background_job_unref0 (job);
@@ -3962,8 +3962,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
#line 3963 "MetadataWriter.c"
}
}
- goto __finally556;
- __catch556_database_error:
+ goto __finally553;
+ __catch553_database_error:
{
GError* err = NULL;
GError* _tmp85_ = NULL;
@@ -3979,7 +3979,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
_g_error_free0 (err);
#line 3981 "MetadataWriter.c"
}
- __finally556:
+ __finally553:
#line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4157,18 +4157,18 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
#line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4160 "MetadataWriter.c"
- goto __catch557_g_error;
+ goto __catch554_g_error;
}
#line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
metadata_writer_commit_job_commit_editable (self, &_inner_error_);
#line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4167 "MetadataWriter.c"
- goto __catch557_g_error;
+ goto __catch554_g_error;
}
}
- goto __finally557;
- __catch557_g_error:
+ goto __finally554;
+ __catch554_g_error:
{
GError* err = NULL;
GError* _tmp0_ = NULL;
@@ -4189,7 +4189,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
_g_error_free0 (err);
#line 4191 "MetadataWriter.c"
}
- __finally557:
+ __finally554:
#line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4291,10 +4291,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
#line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4294 "MetadataWriter.c"
- goto __finally558;
+ goto __finally555;
}
}
- __finally558:
+ __finally555:
{
LibraryPhoto* _tmp16_ = NULL;
GFile* _tmp17_ = NULL;
@@ -4433,10 +4433,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
#line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4436 "MetadataWriter.c"
- goto __finally559;
+ goto __finally556;
}
}
- __finally559:
+ __finally556:
{
LibraryPhoto* _tmp18_ = NULL;
GFile* _tmp19_ = NULL;