Merge tag 'upstream/0.26.0'

Upstream version 0.26.0

1 files changed, 16 insertions, 16 deletions

diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 93664d4..8558571 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -364,11 +364,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "DataImportSource.c"
-				goto __catch216_g_error;
+				goto __catch217_g_error;
 			}
 		}
-		goto __finally216;
-		__catch216_g_error:
+		goto __finally217;
+		__catch217_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp26_ = NULL;
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 401 "DataImportSource.c"
 		}
-		__finally216:
+		__finally217:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 586 "DataImportSource.c"
-					goto __catch217_g_error;
+					goto __catch218_g_error;
 				}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp57_ = preview_raw;
@@ -603,8 +603,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				preview_raw = (g_free (preview_raw), NULL);
 #line 605 "DataImportSource.c"
 			}
-			goto __finally217;
-			__catch217_g_error:
+			goto __finally218;
+			__catch218_g_error:
 			{
 				GError* e = NULL;
 				gchar* _tmp60_ = NULL;
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_error_free0 (e);
 #line 633 "DataImportSource.c"
 			}
-			__finally217:
+			__finally218:
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,14 +670,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 673 "DataImportSource.c"
-				goto __catch218_g_error;
+				goto __catch219_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally218;
-		__catch218_g_error:
+		goto __finally219;
+		__catch219_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp67_ = NULL;
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 706 "DataImportSource.c"
 		}
-		__finally218:
+		__finally219:
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,14 +742,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 745 "DataImportSource.c"
-				goto __catch219_g_error;
+				goto __catch220_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally219;
-		__catch219_g_error:
+		goto __finally220;
+		__catch220_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp74_ = NULL;
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 778 "DataImportSource.c"
 		}
-		__finally219:
+		__finally220:
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"