Update upstream source from tag 'upstream/0.28.2'

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

1 files changed, 20 insertions, 20 deletions

diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index b531dd6..9f9972f 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1373,7 +1373,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1368 "GoogleAuthenticator.c"
-				goto __catch5_spit_publishing_publishing_error;
+				goto __catch3_spit_publishing_publishing_error;
 			}
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (tokens_txn);
@@ -1386,8 +1386,8 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 #line 1379 "GoogleAuthenticator.c"
 		}
 	}
-	goto __finally5;
-	__catch5_spit_publishing_publishing_error:
+	goto __finally3;
+	__catch3_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
@@ -1406,7 +1406,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 		_g_error_free0 (err);
 #line 1400 "GoogleAuthenticator.c"
 	}
-	__finally5:
+	__finally3:
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1562,11 +1562,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1554 "GoogleAuthenticator.c"
-			goto __catch6_g_error;
+			goto __catch4_g_error;
 		}
 	}
-	goto __finally6;
-	__catch6_g_error:
+	goto __finally4;
+	__catch4_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -1608,7 +1608,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		return;
 #line 1599 "GoogleAuthenticator.c"
 	}
-	__finally6:
+	__finally4:
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1965,11 +1965,11 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 #line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1954 "GoogleAuthenticator.c"
-			goto __catch7_g_error;
+			goto __catch5_g_error;
 		}
 	}
-	goto __finally7;
-	__catch7_g_error:
+	goto __finally5;
+	__catch5_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
@@ -1988,7 +1988,7 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 		_g_error_free0 (err);
 #line 1976 "GoogleAuthenticator.c"
 	}
-	__finally7:
+	__finally5:
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2126,11 +2126,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2112 "GoogleAuthenticator.c"
-			goto __catch8_g_error;
+			goto __catch6_g_error;
 		}
 	}
-	goto __finally8;
-	__catch8_g_error:
+	goto __finally6;
+	__catch6_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2172,7 +2172,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		return;
 #line 2157 "GoogleAuthenticator.c"
 	}
-	__finally8:
+	__finally6:
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2361,7 +2361,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 2346 "GoogleAuthenticator.c"
-				goto __catch9_spit_publishing_publishing_error;
+				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
@@ -2374,8 +2374,8 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 #line 2357 "GoogleAuthenticator.c"
 		}
 	}
-	goto __finally9;
-	__catch9_spit_publishing_publishing_error:
+	goto __finally7;
+	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2394,7 +2394,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 		_g_error_free0 (err);
 #line 2378 "GoogleAuthenticator.c"
 	}
-	__finally9:
+	__finally7:
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"