Update upstream source from tag 'upstream/0.28.2'

Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965

1 files changed, 22 insertions, 22 deletions

diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 555f600..9dd784c 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -2963,7 +2963,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 2966 "MetadataWriter.c"
-						goto __catch554_g_error;
+						goto __catch563_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
@@ -2983,8 +2983,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			transaction_controller_commit (_tmp23_);
 #line 2985 "MetadataWriter.c"
 		}
-		goto __finally554;
-		__catch554_g_error:
+		goto __finally563;
+		__catch563_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp24_;
@@ -3018,7 +3018,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_g_error_free0 (err);
 #line 3020 "MetadataWriter.c"
 		}
-		__finally554:
+		__finally563:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3801,7 +3801,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 3804 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch564_database_error;
 					}
 					{
 						LibraryPhoto* _tmp67_;
@@ -3858,7 +3858,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 3861 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch564_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_;
@@ -3890,8 +3890,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally555;
-		__catch555_database_error:
+		goto __finally564;
+		__catch564_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp79_;
@@ -3907,7 +3907,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_error_free0 (err);
 #line 3909 "MetadataWriter.c"
 		}
-		__finally555:
+		__finally564:
 		{
 			LibraryPhoto* _tmp80_;
 			MetadataWriterCommitJob* _tmp81_;
@@ -3954,7 +3954,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 3957 "MetadataWriter.c"
-				goto __catch556_database_error;
+				goto __catch565_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3967,8 +3967,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 3968 "MetadataWriter.c"
 		}
 	}
-	goto __finally556;
-	__catch556_database_error:
+	goto __finally565;
+	__catch565_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp85_;
@@ -3984,7 +3984,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_error_free0 (err);
 #line 3986 "MetadataWriter.c"
 	}
-	__finally556:
+	__finally565:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4162,18 +4162,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 4165 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch566_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 4172 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch566_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally566;
+	__catch566_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_;
@@ -4194,7 +4194,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4196 "MetadataWriter.c"
 	}
-	__finally557:
+	__finally566:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4296,10 +4296,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 4299 "MetadataWriter.c"
-				goto __finally558;
+				goto __finally567;
 			}
 		}
-		__finally558:
+		__finally567:
 		{
 			LibraryPhoto* _tmp16_;
 			GFile* _tmp17_;
@@ -4438,10 +4438,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 4441 "MetadataWriter.c"
-				goto __finally559;
+				goto __finally568;
 			}
 		}
-		__finally559:
+		__finally568:
 		{
 			LibraryPhoto* _tmp18_;
 			GFile* _tmp19_;