Merge branch 'feature/upstream' into develop

1 files changed, 18 insertions, 18 deletions

diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index c1e90ba..7d24773 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1176 "DesktopIntegration.c"
-			goto __catch568_g_error;
+			goto __catch577_g_error;
 		}
 #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp21_ = app_window_get_instance ();
@@ -1185,8 +1185,8 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_object_unref0 (_tmp22_);
 #line 1187 "DesktopIntegration.c"
 	}
-	goto __finally568;
-	__catch568_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp23_;
@@ -1223,7 +1223,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_error_free0 (err);
 #line 1225 "DesktopIntegration.c"
 	}
-	__finally568:
+	__finally577:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1562,11 +1562,11 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1565 "DesktopIntegration.c"
-			goto __catch569_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally569;
-	__catch569_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp27_;
@@ -1608,7 +1608,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		return;
 #line 1610 "DesktopIntegration.c"
 	}
-	__finally569:
+	__finally578:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2603,11 +2603,11 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2606 "DesktopIntegration.c"
-			goto __catch570_g_error;
+			goto __catch579_g_error;
 		}
 	}
-	goto __finally570;
-	__catch570_g_error:
+	goto __finally579;
+	__catch579_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_;
@@ -2627,7 +2627,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		_g_error_free0 (err);
 #line 2628 "DesktopIntegration.c"
 	}
-	__finally570:
+	__finally579:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2762,7 +2762,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2764 "DesktopIntegration.c"
-			goto __catch571_g_error;
+			goto __catch580_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
@@ -2804,7 +2804,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 2806 "DesktopIntegration.c"
-						goto __catch571_g_error;
+						goto __catch580_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
@@ -2824,7 +2824,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2826 "DesktopIntegration.c"
-			goto __catch571_g_error;
+			goto __catch580_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2838,8 +2838,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (_tmp16_);
 #line 2839 "DesktopIntegration.c"
 	}
-	goto __finally571;
-	__catch571_g_error:
+	goto __finally580;
+	__catch580_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
@@ -2872,7 +2872,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		return;
 #line 2873 "DesktopIntegration.c"
 	}
-	__finally571:
+	__finally580:
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"