Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

1 files changed, 930 insertions, 950 deletions

diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 9f9972f..644ee53 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1,7 +1,8 @@
-/* GoogleAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* GoogleAuthenticator.c generated by valac 0.40.4, the Vala compiler
  * generated from GoogleAuthenticator.vala, do not modify */
 
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -24,13 +25,18 @@
 typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPane PublishingAuthenticatorShotwellGoogleWebAuthenticationPane;
 typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass;
 typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_google_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION (publishing_authenticator_shotwell_google_session_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession))
@@ -86,6 +92,11 @@ typedef struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionPri
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
 typedef struct _PublishingAuthenticatorShotwellGoogleGooglePrivate PublishingAuthenticatorShotwellGoogleGooglePrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_google_google_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES];
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 #define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
@@ -177,55 +188,49 @@ static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_goog
 "om"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET "pwpzZ7W1TCcD5uIfYCu8sM7x"
 GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url);
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url);
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type,
+                                                                                                                                        const gchar* auth_sequence_start_url);
 gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void);
 static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj);
 GType publishing_authenticator_shotwell_google_session_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_DUMMY_PROPERTY
-};
 static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base);
 void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self);
 PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void);
 PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type);
 static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj);
 GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
-};
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session,
+                                                                                                                                             const gchar* auth_code);
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type,
+                                                                                                                                                   PublishingAuthenticatorShotwellGoogleSession* session,
+                                                                                                                                                   const gchar* auth_code);
 GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_DUMMY_PROPERTY
-};
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
 PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type,
+                                                                                                                                                         PublishingAuthenticatorShotwellGoogleSession* session);
 GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL "https://www.googleapis.com/oauth2/v1/userinfo"
 PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type,
+                                                                                                                                              PublishingAuthenticatorShotwellGoogleSession* session);
 GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGooglePrivate))
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+                                                                                                  const gchar* welcome_message,
+                                                                                                  SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type,
+                                                                                                        const gchar* scope,
+                                                                                                        const gchar* welcome_message,
+                                                                                                        SpitPublishingPluginHost* host);
 static void _g_free0_ (gpointer var);
 static void _g_variant_unref0_ (gpointer var);
 static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base);
-static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                 const gchar* token);
 static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self);
 static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self);
 static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base);
@@ -233,26 +238,52 @@ static GHashTable* publishing_authenticator_shotwell_google_google_real_get_auth
 static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base);
 static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base);
 static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self);
-static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
-static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
-static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time);
-static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                  const gchar* auth_code);
+static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender,
+                                                                                                                                                               const gchar* auth_code,
+                                                                                                                                                               gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                           const gchar* auth_code);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                 PublishingRESTSupportTransaction* txn,
+                                                                                 GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                    GError* err,
+                                                                                                                                    gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                        const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                              gint64 abs_time);
+static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                const gchar* token);
 static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self);
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                              PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                             gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                          PublishingRESTSupportTransaction* txn,
+                                                                                          GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                             GError* err,
+                                                                                                                                             gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                          const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                                PublishingRESTSupportTransaction* txn,
+                                                                                                GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                                   GError* err,
+                                                                                                                                                   gpointer self);
 static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self);
 static gboolean ____lambda4__gsource_func (gpointer self);
 static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self);
@@ -260,29 +291,33 @@ static void _publishing_authenticator_shotwell_google_google_on_service_welcome_
 static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj);
 
 
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type,
+                                                                            const gchar* auth_sequence_start_url)
+{
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self = NULL;
-	const gchar* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
 #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = auth_sequence_start_url;
-#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
+	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", auth_sequence_start_url, NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 274 "GoogleAuthenticator.c"
+#line 305 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url)
+{
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 281 "GoogleAuthenticator.c"
+#line 314 "GoogleAuthenticator.c"
 }
 
 
-gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void) {
+gboolean
+publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -291,221 +326,168 @@ gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cac
 	result = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 294 "GoogleAuthenticator.c"
+#line 329 "GoogleAuthenticator.c"
 }
 
 
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
+static gint
+string_index_of (const gchar* self,
+                 const gchar* needle,
+                 gint start_index)
+{
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = needle;
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 321 "GoogleAuthenticator.c"
-		gchar* _tmp4_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle);
+#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = _result_;
+#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ != NULL) {
+#line 354 "GoogleAuthenticator.c"
+		gchar* _tmp2_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _result_;
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 329 "GoogleAuthenticator.c"
+#line 362 "GoogleAuthenticator.c"
 	} else {
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 335 "GoogleAuthenticator.c"
+#line 368 "GoogleAuthenticator.c"
 	}
 }
 
 
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+                glong maxlen)
+{
 	glong result = 0L;
 	gchar* end = NULL;
 	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 359 "GoogleAuthenticator.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 367 "GoogleAuthenticator.c"
+#line 393 "GoogleAuthenticator.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 379 "GoogleAuthenticator.c"
+#line 402 "GoogleAuthenticator.c"
 	}
 }
 
 
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+                  glong offset,
+                  glong len)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	glong _tmp6_;
+	gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 403 "GoogleAuthenticator.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 409 "GoogleAuthenticator.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = len >= ((glong) 0);
+#line 423 "GoogleAuthenticator.c"
 	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 413 "GoogleAuthenticator.c"
+#line 427 "GoogleAuthenticator.c"
 	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 417 "GoogleAuthenticator.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 429 "GoogleAuthenticator.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = string_strnlen ((gchar*) self, offset + len);
+#line 433 "GoogleAuthenticator.c"
 	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 439 "GoogleAuthenticator.c"
+		gint _tmp1_;
+		gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp2_;
+#line 443 "GoogleAuthenticator.c"
 	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 445 "GoogleAuthenticator.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 459 "GoogleAuthenticator.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset < ((glong) 0)) {
+#line 447 "GoogleAuthenticator.c"
+		glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 455 "GoogleAuthenticator.c"
 	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 469 "GoogleAuthenticator.c"
+		glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 462 "GoogleAuthenticator.c"
 	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 475 "GoogleAuthenticator.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 484 "GoogleAuthenticator.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (len < ((glong) 0)) {
+#line 466 "GoogleAuthenticator.c"
+		glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp5_ - offset;
+#line 472 "GoogleAuthenticator.c"
 	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 504 "GoogleAuthenticator.c"
+#line 484 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
 	gchar* page_title = NULL;
 	WebKitWebView* _tmp0_;
@@ -514,7 +496,6 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
 	gchar* _tmp3_;
 	gchar* _tmp4_;
 	const gchar* _tmp5_;
-	gint _tmp6_;
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
 #line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -534,60 +515,57 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp5_ = page_title;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp6_ > 0) {
-#line 540 "GoogleAuthenticator.c"
+	if (string_index_of (_tmp5_, "state=connect", 0) > 0) {
+#line 519 "GoogleAuthenticator.c"
 		gint auth_code_field_start = 0;
-		const gchar* _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
+		const gchar* _tmp6_;
+		gint _tmp7_;
 		gchar* auth_code = NULL;
-		const gchar* _tmp10_;
-		gint _tmp11_;
-		gchar* _tmp12_;
-		const gchar* _tmp13_;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp7_ = page_title;
+		const gchar* _tmp8_;
+		gint _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp8_ = string_index_of (_tmp7_, "code=", 0);
+		_tmp6_ = page_title;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		auth_code_field_start = _tmp8_;
+		auth_code_field_start = string_index_of (_tmp6_, "code=", 0);
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = auth_code_field_start;
+		_tmp7_ = auth_code_field_start;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (_tmp9_ < 0) {
+		if (_tmp7_ < 0) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_g_free0 (page_title);
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 564 "GoogleAuthenticator.c"
+#line 540 "GoogleAuthenticator.c"
 		}
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp10_ = page_title;
+		_tmp8_ = page_title;
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp11_ = auth_code_field_start;
+		_tmp9_ = auth_code_field_start;
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
+		_tmp10_ = string_substring (_tmp8_, (glong) (_tmp9_ + 5), (glong) -1);
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		auth_code = _tmp12_;
+		auth_code = _tmp10_;
 #line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty = TRUE;
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp13_ = auth_code;
+		_tmp11_ = auth_code;
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp13_);
+		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp11_);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (auth_code);
-#line 582 "GoogleAuthenticator.c"
+#line 558 "GoogleAuthenticator.c"
 	}
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (page_title);
-#line 586 "GoogleAuthenticator.c"
+#line 562 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_web_authentication_pane_class_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_class_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass * klass)
+{
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -596,25 +574,31 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 599 "GoogleAuthenticator.c"
+#line 577 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self)
+{
 }
 
 
-static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->finalize (obj);
-#line 613 "GoogleAuthenticator.c"
+#line 595 "GoogleAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_instance_init, NULL };
@@ -626,7 +610,9 @@ GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type
 }
 
 
-static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
 	PublishingAuthenticatorShotwellGoogleSession * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
@@ -638,11 +624,13 @@ static gboolean publishing_authenticator_shotwell_google_session_real_is_authent
 	result = _tmp0_ != NULL;
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 641 "GoogleAuthenticator.c"
+#line 627 "GoogleAuthenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self) {
+void
+publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self)
+{
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (self));
 #line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -655,50 +643,60 @@ void publishing_authenticator_shotwell_google_session_deauthenticate (Publishing
 	self->refresh_token = NULL;
 #line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->expires_at = (gint64) -1;
-#line 658 "GoogleAuthenticator.c"
+#line 646 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type) {
+PublishingAuthenticatorShotwellGoogleSession*
+publishing_authenticator_shotwell_google_session_construct (GType object_type)
+{
 	PublishingAuthenticatorShotwellGoogleSession* self = NULL;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = (PublishingAuthenticatorShotwellGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 668 "GoogleAuthenticator.c"
+#line 658 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void) {
+PublishingAuthenticatorShotwellGoogleSession*
+publishing_authenticator_shotwell_google_session_new (void)
+{
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION);
-#line 675 "GoogleAuthenticator.c"
+#line 667 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass)
+{
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_session_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
-#line 686 "GoogleAuthenticator.c"
+#line 680 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self) {
+static void
+publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self)
+{
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->access_token = NULL;
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->refresh_token = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->expires_at = (gint64) -1;
-#line 697 "GoogleAuthenticator.c"
+#line 693 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj)
+{
 	PublishingAuthenticatorShotwellGoogleSession * self;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
@@ -708,11 +706,13 @@ static void publishing_authenticator_shotwell_google_session_finalize (Publishin
 	_g_free0 (self->refresh_token);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_google_session_parent_class)->finalize (obj);
-#line 711 "GoogleAuthenticator.c"
+#line 709 "GoogleAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_google_session_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_session_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_session_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleSession), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_session_instance_init, NULL };
@@ -724,22 +724,20 @@ GType publishing_authenticator_shotwell_google_session_get_type (void) {
 }
 
 
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type,
+                                                                                  PublishingAuthenticatorShotwellGoogleSession* session,
+                                                                                  const gchar* auth_code)
+{
 	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
-	const gchar* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
 #line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (auth_code != NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = session;
-#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = auth_code;
-#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", auth_code);
 #line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
 #line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -750,29 +748,38 @@ PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_auth
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
 #line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 753 "GoogleAuthenticator.c"
+#line 751 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session,
+                                                                            const gchar* auth_code)
+{
 #line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 760 "GoogleAuthenticator.c"
+#line 761 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass)
+{
 #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 767 "GoogleAuthenticator.c"
+#line 770 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init, NULL };
@@ -784,54 +791,59 @@ GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get
 }
 
 
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type,
+                                                                                     PublishingAuthenticatorShotwellGoogleSession* session)
+{
 	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
-	const gchar* _tmp2_;
+	const gchar* _tmp0_;
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
 #line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = session;
-#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
 #line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET);
 #line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = session;
+	_tmp0_ = session->refresh_token;
 #line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = _tmp1_->refresh_token;
-#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp2_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp0_);
 #line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 812 "GoogleAuthenticator.c"
+#line 816 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session)
+{
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 819 "GoogleAuthenticator.c"
+#line 825 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass)
+{
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 826 "GoogleAuthenticator.c"
+#line 834 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init, NULL };
@@ -843,56 +855,61 @@ GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_
 }
 
 
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*
+publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type,
+                                                                               PublishingAuthenticatorShotwellGoogleSession* session)
+{
 	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
 #line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = session;
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = session;
+	_tmp0_ = session->access_token;
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = _tmp1_->access_token;
+	_tmp1_ = g_strconcat ("Bearer ", _tmp0_, NULL);
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = g_strconcat ("Bearer ", _tmp2_, NULL);
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp4_);
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp2_);
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp2_);
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 873 "GoogleAuthenticator.c"
+#line 882 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*
+publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session)
+{
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_username_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 880 "GoogleAuthenticator.c"
+#line 891 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass)
+{
 #line 80 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 887 "GoogleAuthenticator.c"
+#line 900 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init, NULL };
@@ -904,39 +921,47 @@ GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_ty
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 910 "GoogleAuthenticator.c"
+#line 929 "GoogleAuthenticator.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 917 "GoogleAuthenticator.c"
+#line 938 "GoogleAuthenticator.c"
 }
 
 
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 924 "GoogleAuthenticator.c"
+#line 947 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellGoogleGoogle*
+publishing_authenticator_shotwell_google_google_construct (GType object_type,
+                                                           const gchar* scope,
+                                                           const gchar* welcome_message,
+                                                           SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self = NULL;
 	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	GHashFunc _tmp2_;
-	GEqualFunc _tmp3_;
-	GHashTable* _tmp4_;
-	const gchar* _tmp5_;
+	GHashFunc _tmp1_;
+	GEqualFunc _tmp2_;
+	GHashTable* _tmp3_;
+	gchar* _tmp4_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
 	gchar* _tmp6_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp7_;
-	const gchar* _tmp8_;
-	gchar* _tmp9_;
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_val_if_fail (scope != NULL, NULL);
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -946,66 +971,65 @@ PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_g
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = (PublishingAuthenticatorShotwellGoogleGoogle*) g_object_new (object_type, NULL);
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = host;
-#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (host);
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (self->priv->host);
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self->priv->host = _tmp1_;
+	self->priv->host = _tmp0_;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = g_str_hash;
+	_tmp1_ = g_str_hash;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = g_str_equal;
+	_tmp2_ = g_str_equal;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+	_tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, _g_free0_, _g_variant_unref0_);
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_hash_table_unref0 (self->priv->params);
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self->priv->params = _tmp4_;
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = scope;
+	self->priv->params = _tmp3_;
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp4_ = g_strdup (scope);
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (self->priv->scope);
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self->priv->scope = _tmp6_;
+	self->priv->scope = _tmp4_;
 #line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = publishing_authenticator_shotwell_google_session_new ();
+	_tmp5_ = publishing_authenticator_shotwell_google_session_new ();
 #line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self->priv->session = _tmp7_;
+	self->priv->session = _tmp5_;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp8_ = welcome_message;
-#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp9_ = g_strdup (_tmp8_);
+	_tmp6_ = g_strdup (welcome_message);
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (self->priv->welcome_message);
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	self->priv->welcome_message = _tmp9_;
+	self->priv->welcome_message = _tmp6_;
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 990 "GoogleAuthenticator.c"
+#line 1009 "GoogleAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellGoogleGoogle*
+publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+                                                     const gchar* welcome_message,
+                                                     SpitPublishingPluginHost* host)
+{
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_google_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, scope, welcome_message, host);
-#line 997 "GoogleAuthenticator.c"
+#line 1020 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	gchar* refresh_token = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	const gchar* _tmp3_;
-	gboolean _tmp6_;
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1018,21 +1042,21 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
 	_tmp3_ = refresh_token;
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp3_ != NULL) {
-#line 1021 "GoogleAuthenticator.c"
+#line 1045 "GoogleAuthenticator.c"
 		const gchar* _tmp4_;
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = refresh_token;
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 1027 "GoogleAuthenticator.c"
+#line 1051 "GoogleAuthenticator.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = FALSE;
-#line 1031 "GoogleAuthenticator.c"
+#line 1055 "GoogleAuthenticator.c"
 	}
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp2_) {
-#line 1035 "GoogleAuthenticator.c"
+#line 1059 "GoogleAuthenticator.c"
 		const gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = refresh_token;
@@ -1044,40 +1068,40 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
 		_g_free0 (refresh_token);
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1047 "GoogleAuthenticator.c"
+#line 1071 "GoogleAuthenticator.c"
 	}
 #line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ();
-#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp6_) {
-#line 1053 "GoogleAuthenticator.c"
+	if (publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ()) {
+#line 1075 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp6_;
 		SpitPublishingPluginHost* _tmp7_;
-		SpitPublishingPluginHost* _tmp8_;
 #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp7_ = self->priv->host;
+		_tmp6_ = self->priv->host;
 #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+		spit_publishing_plugin_host_set_service_locked (_tmp6_, FALSE);
 #line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp8_ = self->priv->host;
+		_tmp7_ = self->priv->host;
 #line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _ ("You have already logged in and out of a Google service during this Sho" \
+		spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _ ("You have already logged in and out of a Google service during this Sho" \
 "twell session.\n" \
 "\n" \
 "To continue publishing to Google services, quit and restart Shotwell, " \
 "then try publishing again."), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1064 "GoogleAuthenticator.c"
+#line 1086 "GoogleAuthenticator.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (self);
-#line 1068 "GoogleAuthenticator.c"
+#line 1090 "GoogleAuthenticator.c"
 	}
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (refresh_token);
-#line 1072 "GoogleAuthenticator.c"
+#line 1094 "GoogleAuthenticator.c"
 }
 
 
-static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	gboolean result = FALSE;
 #line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1086,18 +1110,22 @@ static gboolean publishing_authenticator_shotwell_google_google_real_can_logout
 	result = TRUE;
 #line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 1085 "GoogleAuthenticator.c"
+#line 1109 "GoogleAuthenticator.c"
 }
 
 
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 1092 "GoogleAuthenticator.c"
+#line 1118 "GoogleAuthenticator.c"
 }
 
 
-static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	GHashTable* result = NULL;
 	GHashTable* _tmp0_;
@@ -1112,11 +1140,13 @@ static GHashTable* publishing_authenticator_shotwell_google_google_real_get_auth
 	result = _tmp1_;
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 1111 "GoogleAuthenticator.c"
+#line 1139 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
@@ -1130,26 +1160,34 @@ static void publishing_authenticator_shotwell_google_google_real_logout (SpitPub
 	_tmp1_ = self->priv->host;
 #line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
-#line 1129 "GoogleAuthenticator.c"
+#line 1159 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
-#line 1137 "GoogleAuthenticator.c"
+#line 1169 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender,
+                                                                                                                                                          const gchar* auth_code,
+                                                                                                                                                          gpointer self)
+{
 #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized ((PublishingAuthenticatorShotwellGoogleGoogle*) self, auth_code);
-#line 1144 "GoogleAuthenticator.c"
+#line 1180 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 	gchar* user_authorization_url = NULL;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1285,16 +1323,17 @@ static void publishing_authenticator_shotwell_google_google_do_hosted_web_authen
 	spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (user_authorization_url);
-#line 1283 "GoogleAuthenticator.c"
+#line 1321 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+static void
+publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                             const gchar* auth_code)
+{
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_;
 	guint _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1308,38 +1347,43 @@ static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_aut
 #line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->scope;
 #line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = auth_code;
-#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:163: EVENT: user authorized scope %s with aut" \
-"h_code %s", _tmp2_, _tmp3_);
+"h_code %s", _tmp2_, auth_code);
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = auth_code;
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, _tmp4_);
-#line 1313 "GoogleAuthenticator.c"
+	publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, auth_code);
+#line 1348 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                              gpointer self)
+{
 #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1320 "GoogleAuthenticator.c"
+#line 1358 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                               GError* err,
+                                                                                                                               gpointer self)
+{
 #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_get_access_tokens_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1327 "GoogleAuthenticator.c"
+#line 1369 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+static void
+publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                      const gchar* auth_code)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* tokens_txn = NULL;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_;
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1355,16 +1399,14 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->session;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = auth_code;
+	_tmp2_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, auth_code);
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, _tmp2_);
-#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	tokens_txn = _tmp3_;
+	tokens_txn = _tmp2_;
 #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1360 "GoogleAuthenticator.c"
+#line 1402 "GoogleAuthenticator.c"
 	{
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1372,7 +1414,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1368 "GoogleAuthenticator.c"
+#line 1410 "GoogleAuthenticator.c"
 				goto __catch3_spit_publishing_publishing_error;
 			}
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1383,28 +1425,28 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 			g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 1379 "GoogleAuthenticator.c"
+#line 1421 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally3;
 	__catch3_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_;
-		GError* _tmp5_;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp4_ = self->priv->host;
+		_tmp3_ = self->priv->host;
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp5_ = err;
+		_tmp4_ = err;
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1400 "GoogleAuthenticator.c"
+#line 1442 "GoogleAuthenticator.c"
 	}
 	__finally3:
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1417,126 +1459,113 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 		g_clear_error (&_inner_error_);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1413 "GoogleAuthenticator.c"
+#line 1455 "GoogleAuthenticator.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1417 "GoogleAuthenticator.c"
+#line 1459 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
 #line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
 #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:188: %s", "EVENT: network transaction to exchange authorization code for access t" \
 "okens " "completed successfully.");
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = txn;
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp6_);
+	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp3_);
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 1457 "GoogleAuthenticator.c"
+	_g_free0 (_tmp3_);
+#line 1493 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                            PublishingRESTSupportTransaction* txn,
+                                                                            GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
 #line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("EVENT: network transaction to exchange authorization code for access t" \
-"okens " "failed; response = '%s'", _tmp6_);
+"okens " "failed; response = '%s'", _tmp3_);
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = self->priv->host;
+	_g_free0 (_tmp3_);
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp8_ = err;
+	_tmp4_ = self->priv->host;
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1503 "GoogleAuthenticator.c"
+	spit_publishing_plugin_host_post_error (_tmp4_, err);
+#line 1531 "GoogleAuthenticator.c"
 }
 
 
-static gpointer _json_object_ref0 (gpointer self) {
+static gpointer
+_json_object_ref0 (gpointer self)
+{
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 1510 "GoogleAuthenticator.c"
+#line 1540 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+static void
+publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                   const gchar* response_body)
+{
 	JsonParser* parser = NULL;
 	JsonParser* _tmp0_;
 	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_;
-	JsonNode* _tmp11_;
+	JsonParser* _tmp9_;
+	JsonNode* _tmp10_;
+	JsonObject* _tmp11_;
 	JsonObject* _tmp12_;
-	JsonObject* _tmp13_;
-	gboolean _tmp14_ = FALSE;
-	JsonObject* _tmp15_;
-	gboolean _tmp16_;
-	JsonObject* _tmp22_;
-	gboolean _tmp23_;
+	gboolean _tmp13_ = FALSE;
+	JsonObject* _tmp14_;
+	JsonObject* _tmp19_;
+	JsonObject* _tmp23_;
 	JsonObject* _tmp29_;
-	gboolean _tmp30_;
-	JsonObject* _tmp36_;
-	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1549,19 +1578,16 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	_tmp0_ = json_parser_new ();
 #line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	parser = _tmp0_;
-#line 1542 "GoogleAuthenticator.c"
+#line 1571 "GoogleAuthenticator.c"
 	{
 		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp1_ = parser;
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp2_ = response_body;
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+		json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1554 "GoogleAuthenticator.c"
+#line 1580 "GoogleAuthenticator.c"
 			goto __catch4_g_error;
 		}
 	}
@@ -1569,44 +1595,44 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	__catch4_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 		gchar* _tmp6_;
-		gchar* _tmp7_;
+		GError* _tmp7_;
 		GError* _tmp8_;
-		GError* _tmp9_;
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp3_ = self->priv->host;
+		_tmp2_ = self->priv->host;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp4_ = err;
+		_tmp3_ = err;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp5_ = _tmp4_->message;
+		_tmp4_ = _tmp3_->message;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+		_tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+		spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_error_free0 (_tmp9_);
+		_g_error_free0 (_tmp8_);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1599 "GoogleAuthenticator.c"
+#line 1625 "GoogleAuthenticator.c"
 	}
 	__finally4:
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1619,316 +1645,290 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		g_clear_error (&_inner_error_);
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1612 "GoogleAuthenticator.c"
+#line 1638 "GoogleAuthenticator.c"
 	}
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp10_ = parser;
+	_tmp9_ = parser;
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp11_ = json_parser_get_root (_tmp10_);
+	_tmp10_ = json_parser_get_root (_tmp9_);
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp12_ = json_node_get_object (_tmp11_);
+	_tmp11_ = json_node_get_object (_tmp10_);
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp13_ = _json_object_ref0 (_tmp12_);
+	_tmp12_ = _json_object_ref0 (_tmp11_);
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	response_obj = _tmp13_;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp15_ = response_obj;
+	response_obj = _tmp12_;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (!_tmp16_) {
-#line 1630 "GoogleAuthenticator.c"
-		JsonObject* _tmp17_;
-		gboolean _tmp18_;
+	_tmp14_ = response_obj;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp17_ = response_obj;
+	if (!json_object_has_member (_tmp14_, "access_token")) {
+#line 1654 "GoogleAuthenticator.c"
+		JsonObject* _tmp15_;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
+		_tmp15_ = response_obj;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp14_ = !_tmp18_;
-#line 1639 "GoogleAuthenticator.c"
+		_tmp13_ = !json_object_has_member (_tmp15_, "refresh_token");
+#line 1660 "GoogleAuthenticator.c"
 	} else {
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp14_ = FALSE;
-#line 1643 "GoogleAuthenticator.c"
+		_tmp13_ = FALSE;
+#line 1664 "GoogleAuthenticator.c"
 	}
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp14_) {
-#line 1647 "GoogleAuthenticator.c"
-		SpitPublishingPluginHost* _tmp19_;
-		GError* _tmp20_;
-		GError* _tmp21_;
+	if (_tmp13_) {
+#line 1668 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp16_;
+		GError* _tmp17_;
+		GError* _tmp18_;
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp19_ = self->priv->host;
+		_tmp16_ = self->priv->host;
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
+		_tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp21_ = _tmp20_;
+		_tmp18_ = _tmp17_;
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
+		spit_publishing_plugin_host_post_error (_tmp16_, _tmp18_);
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_error_free0 (_tmp21_);
+		_g_error_free0 (_tmp18_);
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_json_object_unref0 (response_obj);
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1667 "GoogleAuthenticator.c"
+#line 1688 "GoogleAuthenticator.c"
 	}
 #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp22_ = response_obj;
-#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp23_ = json_object_has_member (_tmp22_, "expires_in");
+	_tmp19_ = response_obj;
 #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp23_) {
-#line 1675 "GoogleAuthenticator.c"
+	if (json_object_has_member (_tmp19_, "expires_in")) {
+#line 1694 "GoogleAuthenticator.c"
 		gint64 duration = 0LL;
-		JsonObject* _tmp24_;
-		gint64 _tmp25_;
+		JsonObject* _tmp20_;
 		gint64 abs_time = 0LL;
-		gint64 _tmp26_;
-		gint64 _tmp27_;
-		gint64 _tmp28_;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp24_ = response_obj;
+		gint64 _tmp21_;
+		gint64 _tmp22_;
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp25_ = json_object_get_int_member (_tmp24_, "expires_in");
+		_tmp20_ = response_obj;
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		duration = _tmp25_;
-#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp26_ = g_get_real_time ();
+		duration = json_object_get_int_member (_tmp20_, "expires_in");
 #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp27_ = duration;
+		_tmp21_ = duration;
 #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		abs_time = _tmp26_ + ((_tmp27_ * 1000L) * 1000L);
+		abs_time = g_get_real_time () + ((_tmp21_ * 1000L) * 1000L);
 #line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp28_ = abs_time;
+		_tmp22_ = abs_time;
 #line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp28_);
-#line 1699 "GoogleAuthenticator.c"
+		publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp22_);
+#line 1712 "GoogleAuthenticator.c"
 	}
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp29_ = response_obj;
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp30_ = json_object_has_member (_tmp29_, "refresh_token");
+	_tmp23_ = response_obj;
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp30_) {
-#line 1707 "GoogleAuthenticator.c"
+	if (json_object_has_member (_tmp23_, "refresh_token")) {
+#line 1718 "GoogleAuthenticator.c"
 		gchar* refresh_token = NULL;
-		JsonObject* _tmp31_;
-		const gchar* _tmp32_;
-		gchar* _tmp33_;
-		const gchar* _tmp34_;
+		JsonObject* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
+		const gchar* _tmp27_;
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp31_ = response_obj;
+		_tmp24_ = response_obj;
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp32_ = json_object_get_string_member (_tmp31_, "refresh_token");
+		_tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp33_ = g_strdup (_tmp32_);
+		_tmp26_ = g_strdup (_tmp25_);
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		refresh_token = _tmp33_;
+		refresh_token = _tmp26_;
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp34_ = refresh_token;
+		_tmp27_ = refresh_token;
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 1725 "GoogleAuthenticator.c"
-			const gchar* _tmp35_;
+		if (g_strcmp0 (_tmp27_, "") != 0) {
+#line 1736 "GoogleAuthenticator.c"
+			const gchar* _tmp28_;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp35_ = refresh_token;
+			_tmp28_ = refresh_token;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp35_);
-#line 1731 "GoogleAuthenticator.c"
+			publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp28_);
+#line 1742 "GoogleAuthenticator.c"
 		}
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (refresh_token);
-#line 1735 "GoogleAuthenticator.c"
+#line 1746 "GoogleAuthenticator.c"
 	}
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp36_ = response_obj;
-#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp37_ = json_object_has_member (_tmp36_, "access_token");
+	_tmp29_ = response_obj;
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp37_) {
-#line 1743 "GoogleAuthenticator.c"
+	if (json_object_has_member (_tmp29_, "access_token")) {
+#line 1752 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
-		JsonObject* _tmp38_;
-		const gchar* _tmp39_;
-		gchar* _tmp40_;
-		const gchar* _tmp41_;
+		JsonObject* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		const gchar* _tmp33_;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp38_ = response_obj;
+		_tmp30_ = response_obj;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp39_ = json_object_get_string_member (_tmp38_, "access_token");
+		_tmp31_ = json_object_get_string_member (_tmp30_, "access_token");
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp40_ = g_strdup (_tmp39_);
+		_tmp32_ = g_strdup (_tmp31_);
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		access_token = _tmp40_;
+		access_token = _tmp32_;
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp41_ = access_token;
+		_tmp33_ = access_token;
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (g_strcmp0 (_tmp41_, "") != 0) {
-#line 1761 "GoogleAuthenticator.c"
-			const gchar* _tmp42_;
+		if (g_strcmp0 (_tmp33_, "") != 0) {
+#line 1770 "GoogleAuthenticator.c"
+			const gchar* _tmp34_;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp42_ = access_token;
+			_tmp34_ = access_token;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp42_);
-#line 1767 "GoogleAuthenticator.c"
+			publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp34_);
+#line 1776 "GoogleAuthenticator.c"
 		}
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 1771 "GoogleAuthenticator.c"
+#line 1780 "GoogleAuthenticator.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_json_object_unref0 (response_obj);
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (parser);
-#line 1777 "GoogleAuthenticator.c"
+#line 1786 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
-	const gchar* _tmp0_;
-	GHashTable* _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	GVariant* _tmp4_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                            const gchar* token)
+{
+	GHashTable* _tmp0_;
+	gchar* _tmp1_;
+	GVariant* _tmp2_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp3_;
+	gchar* _tmp4_;
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (token != NULL);
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = token;
-#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:248: EVENT: an OAuth refresh token has become" \
-" available; token = '%s'.", _tmp0_);
+" available; token = '%s'.", token);
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = self->priv->params;
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = g_strdup ("RefreshToken");
+	_tmp0_ = self->priv->params;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = token;
+	_tmp1_ = g_strdup ("RefreshToken");
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = g_variant_new_string (_tmp3_);
+	_tmp2_ = g_variant_new_string (token);
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_variant_ref_sink (_tmp4_);
+	g_variant_ref_sink (_tmp2_);
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_hash_table_insert (_tmp1_, _tmp2_, _tmp4_);
+	g_hash_table_insert (_tmp0_, _tmp1_, _tmp2_);
 #line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = self->priv->session;
+	_tmp3_ = self->priv->session;
 #line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = token;
+	_tmp4_ = g_strdup (token);
 #line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_g_free0 (_tmp3_->refresh_token);
 #line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp5_->refresh_token);
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_->refresh_token = _tmp7_;
-#line 1820 "GoogleAuthenticator.c"
+	_tmp3_->refresh_token = _tmp4_;
+#line 1823 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time) {
-	gint64 _tmp0_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
-	gint64 _tmp2_;
-	GHashTable* _tmp3_;
-	gchar* _tmp4_;
-	gint64 _tmp5_;
-	GVariant* _tmp6_;
+static void
+publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                         gint64 abs_time)
+{
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+	GHashTable* _tmp1_;
+	gchar* _tmp2_;
+	GVariant* _tmp3_;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = abs_time;
-#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", _tmp0_);
+	g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", abs_time);
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = self->priv->session;
-#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = abs_time;
+	_tmp0_ = self->priv->session;
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_->expires_at = _tmp2_;
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = self->priv->params;
+	_tmp0_->expires_at = abs_time;
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = g_strdup ("ExpiryTime");
+	_tmp1_ = self->priv->params;
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = abs_time;
+	_tmp2_ = g_strdup ("ExpiryTime");
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = g_variant_new_int64 (_tmp5_);
+	_tmp3_ = g_variant_new_int64 (abs_time);
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_variant_ref_sink (_tmp6_);
+	g_variant_ref_sink (_tmp3_);
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_hash_table_insert (_tmp3_, _tmp4_, _tmp6_);
-#line 1856 "GoogleAuthenticator.c"
+	g_hash_table_insert (_tmp1_, _tmp2_, _tmp3_);
+#line 1853 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
-	const gchar* _tmp0_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
-	const gchar* _tmp2_;
+static void
+publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                           const gchar* token)
+{
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+	gchar* _tmp1_;
+	GHashTable* _tmp2_;
 	gchar* _tmp3_;
-	GHashTable* _tmp4_;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	GVariant* _tmp7_;
+	GVariant* _tmp4_;
 #line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (token != NULL);
 #line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = token;
-#line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:264: EVENT: an OAuth access token has become " \
-"available; token = '%s'.", _tmp0_);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_ = self->priv->session;
+"available; token = '%s'.", token);
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = token;
+	_tmp0_ = self->priv->session;
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (token);
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp1_->access_token);
+	_g_free0 (_tmp0_->access_token);
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp1_->access_token = _tmp3_;
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = self->priv->params;
+	_tmp0_->access_token = _tmp1_;
 #line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = g_strdup ("AccessToken");
+	_tmp2_ = self->priv->params;
 #line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = token;
+	_tmp3_ = g_strdup ("AccessToken");
 #line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = g_variant_new_string (_tmp6_);
+	_tmp4_ = g_variant_new_string (token);
 #line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_variant_ref_sink (_tmp7_);
+	g_variant_ref_sink (_tmp4_);
 #line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_hash_table_insert (_tmp4_, _tmp5_, _tmp7_);
+	g_hash_table_insert (_tmp2_, _tmp3_, _tmp4_);
 #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_fetch_username (self);
-#line 1901 "GoogleAuthenticator.c"
+#line 1892 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                        gpointer self)
+{
 #line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1908 "GoogleAuthenticator.c"
+#line 1902 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                        GError* err,
+                                                                                                                                        gpointer self)
+{
 #line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1915 "GoogleAuthenticator.c"
+#line 1913 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* txn = NULL;
@@ -2007,100 +2007,89 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                         PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
 #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
 #line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:293: EVENT: username fetch transaction comple" \
 "ted successfully.");
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = txn;
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp6_);
+	publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp3_);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 2033 "GoogleAuthenticator.c"
+	_g_free0 (_tmp3_);
+#line 2027 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                     PublishingRESTSupportTransaction* txn,
+                                                                                     GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GError* _tmp5_;
+	SpitPublishingPluginHost* _tmp2_;
 #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
 #line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
 #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:303: EVENT: username fetch transaction caused" \
 " a network error");
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = self->priv->host;
-#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = err;
+	_tmp2_ = self->priv->host;
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 2068 "GoogleAuthenticator.c"
+	spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 2057 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+static void
+publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                     const gchar* response_body)
+{
 	JsonParser* parser = NULL;
 	JsonParser* _tmp0_;
 	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_;
-	JsonNode* _tmp11_;
+	JsonParser* _tmp9_;
+	JsonNode* _tmp10_;
+	JsonObject* _tmp11_;
 	JsonObject* _tmp12_;
 	JsonObject* _tmp13_;
-	JsonObject* _tmp14_;
-	gboolean _tmp15_;
-	JsonObject* _tmp24_;
-	gboolean _tmp25_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp34_;
-	gboolean _tmp35_;
-	SpitPublishingPluginHost* _tmp36_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp37_;
-	const gchar* _tmp38_;
+	JsonObject* _tmp22_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp31_;
+	SpitPublishingPluginHost* _tmp32_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp33_;
+	const gchar* _tmp34_;
 	GError * _inner_error_ = NULL;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -2113,19 +2102,16 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	_tmp0_ = json_parser_new ();
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	parser = _tmp0_;
-#line 2100 "GoogleAuthenticator.c"
+#line 2089 "GoogleAuthenticator.c"
 	{
 		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp1_ = parser;
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp2_ = response_body;
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+		json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2112 "GoogleAuthenticator.c"
+#line 2098 "GoogleAuthenticator.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -2133,44 +2119,44 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	__catch6_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 		gchar* _tmp6_;
-		gchar* _tmp7_;
+		GError* _tmp7_;
 		GError* _tmp8_;
-		GError* _tmp9_;
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp3_ = self->priv->host;
+		_tmp2_ = self->priv->host;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp4_ = err;
+		_tmp3_ = err;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp5_ = _tmp4_->message;
+		_tmp4_ = _tmp3_->message;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+		_tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+		spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_error_free0 (_tmp9_);
+		_g_error_free0 (_tmp8_);
 #line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
 #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
 #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2157 "GoogleAuthenticator.c"
+#line 2143 "GoogleAuthenticator.c"
 	}
 	__finally6:
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2183,151 +2169,154 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		g_clear_error (&_inner_error_);
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2170 "GoogleAuthenticator.c"
+#line 2156 "GoogleAuthenticator.c"
 	}
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp10_ = parser;
+	_tmp9_ = parser;
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp11_ = json_parser_get_root (_tmp10_);
+	_tmp10_ = json_parser_get_root (_tmp9_);
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp12_ = json_node_get_object (_tmp11_);
+	_tmp11_ = json_node_get_object (_tmp10_);
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp13_ = _json_object_ref0 (_tmp12_);
+	_tmp12_ = _json_object_ref0 (_tmp11_);
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	response_obj = _tmp13_;
-#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp14_ = response_obj;
+	response_obj = _tmp12_;
 #line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp15_ = json_object_has_member (_tmp14_, "name");
+	_tmp13_ = response_obj;
 #line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp15_) {
-#line 2188 "GoogleAuthenticator.c"
+	if (json_object_has_member (_tmp13_, "name")) {
+#line 2172 "GoogleAuthenticator.c"
 		gchar* username = NULL;
-		JsonObject* _tmp16_;
+		JsonObject* _tmp14_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
 		const gchar* _tmp17_;
-		gchar* _tmp18_;
-		const gchar* _tmp19_;
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp16_ = response_obj;
+		_tmp14_ = response_obj;
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp17_ = json_object_get_string_member (_tmp16_, "name");
+		_tmp15_ = json_object_get_string_member (_tmp14_, "name");
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp18_ = g_strdup (_tmp17_);
+		_tmp16_ = g_strdup (_tmp15_);
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		username = _tmp18_;
+		username = _tmp16_;
 #line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp19_ = username;
+		_tmp17_ = username;
 #line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 2206 "GoogleAuthenticator.c"
-			GHashTable* _tmp20_;
-			gchar* _tmp21_;
-			const gchar* _tmp22_;
-			GVariant* _tmp23_;
+		if (g_strcmp0 (_tmp17_, "") != 0) {
+#line 2190 "GoogleAuthenticator.c"
+			GHashTable* _tmp18_;
+			gchar* _tmp19_;
+			const gchar* _tmp20_;
+			GVariant* _tmp21_;
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp20_ = self->priv->params;
+			_tmp18_ = self->priv->params;
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp21_ = g_strdup ("UserName");
+			_tmp19_ = g_strdup ("UserName");
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp22_ = username;
+			_tmp20_ = username;
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp23_ = g_variant_new_string (_tmp22_);
+			_tmp21_ = g_variant_new_string (_tmp20_);
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			g_variant_ref_sink (_tmp23_);
+			g_variant_ref_sink (_tmp21_);
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			g_hash_table_insert (_tmp20_, _tmp21_, _tmp23_);
-#line 2223 "GoogleAuthenticator.c"
+			g_hash_table_insert (_tmp18_, _tmp19_, _tmp21_);
+#line 2207 "GoogleAuthenticator.c"
 		}
 #line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (username);
-#line 2227 "GoogleAuthenticator.c"
+#line 2211 "GoogleAuthenticator.c"
 	}
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp24_ = response_obj;
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp25_ = json_object_has_member (_tmp24_, "access_token");
+	_tmp22_ = response_obj;
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp25_) {
-#line 2235 "GoogleAuthenticator.c"
+	if (json_object_has_member (_tmp22_, "access_token")) {
+#line 2217 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
-		JsonObject* _tmp26_;
-		const gchar* _tmp27_;
-		gchar* _tmp28_;
-		const gchar* _tmp29_;
+		JsonObject* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
+		const gchar* _tmp26_;
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp26_ = response_obj;
+		_tmp23_ = response_obj;
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp27_ = json_object_get_string_member (_tmp26_, "access_token");
+		_tmp24_ = json_object_get_string_member (_tmp23_, "access_token");
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp28_ = g_strdup (_tmp27_);
+		_tmp25_ = g_strdup (_tmp24_);
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		access_token = _tmp28_;
+		access_token = _tmp25_;
 #line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp29_ = access_token;
+		_tmp26_ = access_token;
 #line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (g_strcmp0 (_tmp29_, "") != 0) {
-#line 2253 "GoogleAuthenticator.c"
-			GHashTable* _tmp30_;
-			gchar* _tmp31_;
-			const gchar* _tmp32_;
-			GVariant* _tmp33_;
+		if (g_strcmp0 (_tmp26_, "") != 0) {
+#line 2235 "GoogleAuthenticator.c"
+			GHashTable* _tmp27_;
+			gchar* _tmp28_;
+			const gchar* _tmp29_;
+			GVariant* _tmp30_;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp30_ = self->priv->params;
+			_tmp27_ = self->priv->params;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp31_ = g_strdup ("AccessToken");
+			_tmp28_ = g_strdup ("AccessToken");
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp32_ = access_token;
+			_tmp29_ = access_token;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_tmp33_ = g_variant_new_string (_tmp32_);
+			_tmp30_ = g_variant_new_string (_tmp29_);
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			g_variant_ref_sink (_tmp33_);
+			g_variant_ref_sink (_tmp30_);
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			g_hash_table_insert (_tmp30_, _tmp31_, _tmp33_);
-#line 2270 "GoogleAuthenticator.c"
+			g_hash_table_insert (_tmp27_, _tmp28_, _tmp30_);
+#line 2252 "GoogleAuthenticator.c"
 		}
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 2274 "GoogleAuthenticator.c"
+#line 2256 "GoogleAuthenticator.c"
 	}
 #line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp34_ = self->priv->session;
+	_tmp31_ = self->priv->session;
 #line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp35_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_vala_assert (_tmp35_, "session.is_authenticated()");
+	_vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
 #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp36_ = self->priv->host;
+	_tmp32_ = self->priv->host;
 #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp37_ = self->priv->session;
+	_tmp33_ = self->priv->session;
 #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp38_ = _tmp37_->refresh_token;
+	_tmp34_ = _tmp33_->refresh_token;
 #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp38_);
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp34_);
 #line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_json_object_unref0 (response_obj);
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (parser);
-#line 2296 "GoogleAuthenticator.c"
+#line 2276 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                              gpointer self)
+{
 #line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 2303 "GoogleAuthenticator.c"
+#line 2286 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                              GError* err,
+                                                                                                                                              gpointer self)
+{
 #line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 2310 "GoogleAuthenticator.c"
+#line 2297 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* txn = NULL;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
@@ -2352,7 +2341,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2338 "GoogleAuthenticator.c"
+#line 2327 "GoogleAuthenticator.c"
 	{
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2360,7 +2349,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2346 "GoogleAuthenticator.c"
+#line 2335 "GoogleAuthenticator.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2371,7 +2360,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 			g_clear_error (&_inner_error_);
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 2357 "GoogleAuthenticator.c"
+#line 2346 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally7;
@@ -2392,7 +2381,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 2378 "GoogleAuthenticator.c"
+#line 2367 "GoogleAuthenticator.c"
 	}
 	__finally7:
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2405,68 +2394,61 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 		g_clear_error (&_inner_error_);
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2391 "GoogleAuthenticator.c"
+#line 2380 "GoogleAuthenticator.c"
 	}
 #line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2395 "GoogleAuthenticator.c"
+#line 2384 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
-	gboolean _tmp5_;
-	PublishingRESTSupportTransaction* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
 #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
 #line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:368: EVENT: refresh access token transaction " \
 "completed successfully.");
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = self->priv->session;
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp5_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2435 "GoogleAuthenticator.c"
+#line 2417 "GoogleAuthenticator.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp6_ = txn;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = publishing_rest_support_transaction_get_response (_tmp6_);
+	_tmp3_ = publishing_rest_support_transaction_get_response (txn);
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp8_);
+	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp4_);
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (_tmp8_);
-#line 2447 "GoogleAuthenticator.c"
+	_g_free0 (_tmp4_);
+#line 2427 "GoogleAuthenticator.c"
 }
 
 
-static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static gboolean
+___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 	gboolean result = FALSE;
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_authenticator_authenticate (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator));
@@ -2474,110 +2456,96 @@ static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
 	result = FALSE;
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2459 "GoogleAuthenticator.c"
+#line 2441 "GoogleAuthenticator.c"
 }
 
 
-static gboolean ____lambda4__gsource_func (gpointer self) {
+static gboolean
+____lambda4__gsource_func (gpointer self)
+{
 	gboolean result;
 	result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2468 "GoogleAuthenticator.c"
+#line 2452 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self,
+                                                                                           PublishingRESTSupportTransaction* txn,
+                                                                                           GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_;
-	guint _tmp8_;
-	SpitPublishingPluginHost* _tmp12_;
-	GError* _tmp13_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+	gboolean _tmp3_ = FALSE;
+	SpitPublishingPluginHost* _tmp5_;
 #line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp0_ = txn;
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
 #line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
 #line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("GoogleAuthenticator.vala:381: EVENT: refresh access token transaction " \
 "caused a network error.");
 #line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp4_ = self->priv->session;
-#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp5_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2510 "GoogleAuthenticator.c"
+#line 2486 "GoogleAuthenticator.c"
 	}
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp7_ = txn;
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
+	if (publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_BAD_REQUEST)) {
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp8_ == ((guint) SOUP_STATUS_BAD_REQUEST)) {
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp6_ = TRUE;
-#line 2520 "GoogleAuthenticator.c"
+		_tmp3_ = TRUE;
+#line 2492 "GoogleAuthenticator.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp9_;
-		guint _tmp10_;
-#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = txn;
 #line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
-#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_UNAUTHORIZED);
-#line 2530 "GoogleAuthenticator.c"
+		_tmp3_ = publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_UNAUTHORIZED);
+#line 2496 "GoogleAuthenticator.c"
 	}
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	if (_tmp6_) {
-#line 2534 "GoogleAuthenticator.c"
-		SpitPublishingPluginHost* _tmp11_;
+	if (_tmp3_) {
+#line 2500 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp4_;
 #line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp11_ = self->priv->host;
+		_tmp4_ = self->priv->host;
 #line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
+		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda4__gsource_func, g_object_ref (self), g_object_unref);
-#line 2542 "GoogleAuthenticator.c"
+#line 2508 "GoogleAuthenticator.c"
 	}
 #line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp12_ = self->priv->host;
+	_tmp5_ = self->priv->host;
 #line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_tmp13_ = err;
-#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp12_, _tmp13_);
-#line 2550 "GoogleAuthenticator.c"
+	spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 2514 "GoogleAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self)
+{
 #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_service_welcome_login ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
-#line 2557 "GoogleAuthenticator.c"
+#line 2523 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	const gchar* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2590,11 +2558,13 @@ static void publishing_authenticator_shotwell_google_google_do_show_service_welc
 	_tmp1_ = self->priv->welcome_message;
 #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2574 "GoogleAuthenticator.c"
+#line 2542 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+static void
+publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self)
+{
 #line 401 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2602,22 +2572,26 @@ static void publishing_authenticator_shotwell_google_google_on_service_welcome_l
 "ane.");
 #line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (self);
-#line 2585 "GoogleAuthenticator.c"
+#line 2555 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass) {
+static void
+publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass)
+{
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_parent_class = g_type_class_peek_parent (klass);
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellGoogleGooglePrivate));
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_google_finalize;
-#line 2596 "GoogleAuthenticator.c"
+#line 2568 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2630,11 +2604,13 @@ static void publishing_authenticator_shotwell_google_google_spit_publishing_auth
 	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_logout;
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_refresh;
-#line 2613 "GoogleAuthenticator.c"
+#line 2587 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self) {
+static void
+publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self)
+{
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE (self);
 #line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2649,11 +2625,13 @@ static void publishing_authenticator_shotwell_google_google_instance_init (Publi
 	self->priv->session = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->welcome_message = NULL;
-#line 2632 "GoogleAuthenticator.c"
+#line 2608 "GoogleAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_google_google_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_google_google_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
@@ -2671,11 +2649,13 @@ static void publishing_authenticator_shotwell_google_google_finalize (GObject *
 	_g_free0 (self->priv->welcome_message);
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_google_parent_class)->finalize (obj);
-#line 2654 "GoogleAuthenticator.c"
+#line 2632 "GoogleAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_google_google_get_type (void) {
+GType
+publishing_authenticator_shotwell_google_google_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_google_google_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_google_google_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGoogleClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_google_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGoogle), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_google_instance_init, NULL };