New upstream version 0.28.3upstream/0.28.3

6 files changed, 3115 insertions, 2825 deletions

diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
index 480b915..d1e2389 100644
--- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FacebookPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* FacebookPublishingAuthenticator.c generated by valac 0.40.4, the Vala compiler
  * generated from FacebookPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -30,6 +31,11 @@
 typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPane PublishingAuthenticatorShotwellFacebookWebAuthenticationPane;
 typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass;
 typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP (publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup))
@@ -50,9 +56,9 @@ typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePara
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL,
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL,
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK (publishing_authenticator_shotwell_facebook_facebook_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook))
@@ -64,6 +70,11 @@ static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_
 typedef struct _PublishingAuthenticatorShotwellFacebookFacebook PublishingAuthenticatorShotwellFacebookFacebook;
 typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingAuthenticatorShotwellFacebookFacebookClass;
 typedef struct _PublishingAuthenticatorShotwellFacebookFacebookPrivate PublishingAuthenticatorShotwellFacebookFacebookPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_facebook_facebook_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_NUM_PROPERTIES];
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -130,34 +141,42 @@ static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_face
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID "1612018629063184"
 GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance);
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance);
-static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name,
+                                                                                                         const gchar* nick,
+                                                                                                         const gchar* blurb,
+                                                                                                         GType object_type,
+                                                                                                         GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value,
+                                                                                                 gpointer v_object) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value,
+                                                                                                  gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix,
+                                                                                                                                                                const gchar* translation,
+                                                                                                                                                                const gchar* exception_code,
+                                                                                                                                                                const gchar* exception_translation,
+                                                                                                                                                                const gchar* exception_code_2,
+                                                                                                                                                                const gchar* exception_translation_2);
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type,
+                                                                                                                                                                      const gchar* prefix,
+                                                                                                                                                                      const gchar* translation,
+                                                                                                                                                                      const gchar* exception_code,
+                                                                                                                                                                      const gchar* exception_translation,
+                                                                                                                                                                      const gchar* exception_code_2,
+                                                                                                                                                                      const gchar* exception_translation_2);
 PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void);
 PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type);
 static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void);
 static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void);
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void);
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY
-};
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj);
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj);
 GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookPrivate))
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_DUMMY_PROPERTY
-};
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Facebook.\n" \
 "\n" \
 "If you don’t yet have a Facebook account, you can create one during th" \
@@ -169,7 +188,8 @@ enum  {
 "To continue publishing to Facebook, quit and restart Shotwell, then tr" \
 "y publishing again.")
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+                                                                                                                SpitPublishingPluginHost* host);
 static void _g_free0_ (gpointer var);
 static void _g_variant_unref0_ (gpointer var);
 static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base);
@@ -179,24 +199,36 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_
 static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base);
 static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
 void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token);
+static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                                      const gchar* access_token);
 static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base);
 static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base);
 static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self);
 static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self);
 static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url);
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                                           const gchar* success_url);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+                                                                                                                                                                               const gchar* success_url,
+                                                                                                                                                                               gpointer self);
 static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self);
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self);
-static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+                                                                                                                                                                         gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                                  const gchar* good_login_uri);
 static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 
-PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type) {
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self = NULL;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -210,45 +242,51 @@ PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authent
 	_g_free0 (_tmp1_);
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 206 "FacebookPublishingAuthenticator.c"
+#line 238 "FacebookPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void) {
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void)
+{
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE);
-#line 213 "FacebookPublishingAuthenticator.c"
+#line 247 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gpointer _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
+static gpointer
+_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self)
+{
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self ? publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
-#line 220 "FacebookPublishingAuthenticator.c"
+#line 256 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+                 const gchar* needle)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 240 "FacebookPublishingAuthenticator.c"
+#line 276 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void)
+{
 	gchar* result = NULL;
 	const gchar* raw_system_locale = NULL;
 	const gchar* _tmp0_;
@@ -265,7 +303,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 	gchar* _tmp11_;
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_;
 	gint _tmp12__length1;
-	gchar* _tmp43_;
+	gchar* _tmp40_;
 #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = setlocale (LC_ALL, "");
 #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -276,18 +314,18 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 	if (_tmp2_ == NULL) {
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp1_ = TRUE;
-#line 272 "FacebookPublishingAuthenticator.c"
+#line 310 "FacebookPublishingAuthenticator.c"
 	} else {
 		const gchar* _tmp3_;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp3_ = raw_system_locale;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
-#line 279 "FacebookPublishingAuthenticator.c"
+#line 317 "FacebookPublishingAuthenticator.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp1_) {
-#line 283 "FacebookPublishingAuthenticator.c"
+#line 321 "FacebookPublishingAuthenticator.c"
 		gchar* _tmp4_;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp4_ = g_strdup ("www");
@@ -295,7 +333,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 		result = _tmp4_;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return result;
-#line 291 "FacebookPublishingAuthenticator.c"
+#line 329 "FacebookPublishingAuthenticator.c"
 	}
 #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp5_ = raw_system_locale;
@@ -319,7 +357,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 	_tmp12_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table;
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp12__length1 = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1;
-#line 315 "FacebookPublishingAuthenticator.c"
+#line 353 "FacebookPublishingAuthenticator.c"
 	{
 		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
 		gint locale_lookup_collection_length1 = 0;
@@ -331,26 +369,25 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 		locale_lookup_collection_length1 = _tmp12__length1;
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) {
-#line 327 "FacebookPublishingAuthenticator.c"
+#line 365 "FacebookPublishingAuthenticator.c"
 			PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_;
 			PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 			_tmp13_ = _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]);
 #line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 			locale_lookup = _tmp13_;
-#line 334 "FacebookPublishingAuthenticator.c"
+#line 372 "FacebookPublishingAuthenticator.c"
 			{
 				const gchar* _tmp14_;
 				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_;
 				const gchar* _tmp16_;
-				gboolean _tmp17_;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_;
-				const gchar* _tmp19_;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_;
-				const gchar* _tmp30_;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_;
-				const gchar* _tmp41_;
-				gchar* _tmp42_;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_;
+				const gchar* _tmp18_;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_;
+				const gchar* _tmp28_;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
+				const gchar* _tmp38_;
+				gchar* _tmp39_;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				_tmp14_ = system_locale;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -358,146 +395,140 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				_tmp16_ = _tmp15_->prefix;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				if (!_tmp17_) {
+				if (!g_str_has_prefix (_tmp14_, _tmp16_)) {
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 					_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 					continue;
-#line 361 "FacebookPublishingAuthenticator.c"
+#line 396 "FacebookPublishingAuthenticator.c"
 				}
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp18_ = locale_lookup;
+				_tmp17_ = locale_lookup;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp19_ = _tmp18_->exception_code;
+				_tmp18_ = _tmp17_->exception_code;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				if (_tmp19_ != NULL) {
-#line 369 "FacebookPublishingAuthenticator.c"
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_;
+				if (_tmp18_ != NULL) {
+#line 404 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_;
+					const gchar* _tmp20_;
 					const gchar* _tmp21_;
-					const gchar* _tmp22_;
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_;
-					const gchar* _tmp24_;
-					gboolean _tmp25_;
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_;
+					const gchar* _tmp23_;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp20_ = locale_lookup;
+					_tmp19_ = locale_lookup;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp21_ = _tmp20_->exception_translation;
+					_tmp20_ = _tmp19_->exception_translation;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
+					_vala_assert (_tmp20_ != NULL, "locale_lookup.exception_translation != null");
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp22_ = system_locale;
+					_tmp21_ = system_locale;
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp23_ = locale_lookup;
+					_tmp22_ = locale_lookup;
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp24_ = _tmp23_->exception_code;
+					_tmp23_ = _tmp22_->exception_code;
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp25_ = string_contains (_tmp22_, _tmp24_);
-#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					if (_tmp25_) {
-#line 392 "FacebookPublishingAuthenticator.c"
-						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_;
-						const gchar* _tmp27_;
-						gchar* _tmp28_;
+					if (string_contains (_tmp21_, _tmp23_)) {
+#line 424 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_;
+						const gchar* _tmp25_;
+						gchar* _tmp26_;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp26_ = locale_lookup;
+						_tmp24_ = locale_lookup;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp27_ = _tmp26_->exception_translation;
+						_tmp25_ = _tmp24_->exception_translation;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp28_ = g_strdup (_tmp27_);
+						_tmp26_ = g_strdup (_tmp25_);
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						result = _tmp28_;
+						result = _tmp26_;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_g_free0 (system_locale);
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						return result;
-#line 410 "FacebookPublishingAuthenticator.c"
+#line 442 "FacebookPublishingAuthenticator.c"
 					}
 				}
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp29_ = locale_lookup;
+				_tmp27_ = locale_lookup;
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp30_ = _tmp29_->exception_code_2;
+				_tmp28_ = _tmp27_->exception_code_2;
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				if (_tmp30_ != NULL) {
-#line 419 "FacebookPublishingAuthenticator.c"
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_;
-					const gchar* _tmp32_;
+				if (_tmp28_ != NULL) {
+#line 451 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_;
+					const gchar* _tmp30_;
+					const gchar* _tmp31_;
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_;
 					const gchar* _tmp33_;
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_;
-					const gchar* _tmp35_;
-					gboolean _tmp36_;
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp31_ = locale_lookup;
+					_tmp29_ = locale_lookup;
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp32_ = _tmp31_->exception_translation_2;
+					_tmp30_ = _tmp29_->exception_translation_2;
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
+					_vala_assert (_tmp30_ != NULL, "locale_lookup.exception_translation_2 != null");
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp33_ = system_locale;
+					_tmp31_ = system_locale;
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp34_ = locale_lookup;
+					_tmp32_ = locale_lookup;
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp35_ = _tmp34_->exception_code_2;
+					_tmp33_ = _tmp32_->exception_code_2;
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					_tmp36_ = string_contains (_tmp33_, _tmp35_);
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-					if (_tmp36_) {
-#line 442 "FacebookPublishingAuthenticator.c"
-						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
-						const gchar* _tmp38_;
-						gchar* _tmp39_;
+					if (string_contains (_tmp31_, _tmp33_)) {
+#line 471 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_;
+						const gchar* _tmp35_;
+						gchar* _tmp36_;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp37_ = locale_lookup;
+						_tmp34_ = locale_lookup;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp38_ = _tmp37_->exception_translation_2;
+						_tmp35_ = _tmp34_->exception_translation_2;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						_tmp39_ = g_strdup (_tmp38_);
+						_tmp36_ = g_strdup (_tmp35_);
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-						result = _tmp39_;
+						result = _tmp36_;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_g_free0 (system_locale);
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						return result;
-#line 460 "FacebookPublishingAuthenticator.c"
+#line 489 "FacebookPublishingAuthenticator.c"
 					}
 				}
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp40_ = locale_lookup;
+				_tmp37_ = locale_lookup;
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp41_ = _tmp40_->translation;
+				_tmp38_ = _tmp37_->translation;
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				_tmp42_ = g_strdup (_tmp41_);
+				_tmp39_ = g_strdup (_tmp38_);
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-				result = _tmp42_;
+				result = _tmp39_;
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				_g_free0 (system_locale);
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				return result;
-#line 477 "FacebookPublishingAuthenticator.c"
+#line 506 "FacebookPublishingAuthenticator.c"
 			}
 		}
 	}
 #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp43_ = g_strdup ("www");
+	_tmp40_ = g_strdup ("www");
 #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	result = _tmp43_;
+	result = _tmp40_;
 #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (system_locale);
 #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 489 "FacebookPublishingAuthenticator.c"
+#line 518 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void)
+{
 	gchar* result = NULL;
 	gchar* facebook_locale = NULL;
 	gchar* _tmp0_;
@@ -516,332 +547,286 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 	_g_free0 (facebook_locale);
 #line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 510 "FacebookPublishingAuthenticator.c"
+#line 541 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
+static gint
+string_index_of_char (const gchar* self,
+                      gunichar c,
+                      gint start_index)
+{
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_;
-	gunichar _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1045 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 535 "FacebookPublishingAuthenticator.c"
-		gchar* _tmp4_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = g_utf8_strchr (((gchar*) self) + start_index, (gssize) -1, c);
+#line 1046 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = _result_;
+#line 1048 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ != NULL) {
+#line 564 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp2_;
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _result_;
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 543 "FacebookPublishingAuthenticator.c"
+#line 572 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 549 "FacebookPublishingAuthenticator.c"
+#line 578 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+              glong start,
+              glong end)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gint _tmp0_;
 	gint _tmp1_;
-	glong _tmp2_;
-	glong _tmp5_;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_;
-	glong _tmp16_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	gchar* _tmp21_;
-#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 583 "FacebookPublishingAuthenticator.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (start < ((glong) 0)) {
+#line 605 "FacebookPublishingAuthenticator.c"
+		glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		start = _tmp2_ + start;
+#line 611 "FacebookPublishingAuthenticator.c"
+	}
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (end < ((glong) 0)) {
+#line 615 "FacebookPublishingAuthenticator.c"
 		glong _tmp3_;
-		glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 592 "FacebookPublishingAuthenticator.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		end = _tmp3_ + end;
+#line 621 "FacebookPublishingAuthenticator.c"
 	}
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 598 "FacebookPublishingAuthenticator.c"
-		glong _tmp6_;
-		glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 607 "FacebookPublishingAuthenticator.c"
-	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 613 "FacebookPublishingAuthenticator.c"
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 622 "FacebookPublishingAuthenticator.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (start >= ((glong) 0)) {
+#line 625 "FacebookPublishingAuthenticator.c"
+		glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = start <= _tmp5_;
+#line 631 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 626 "FacebookPublishingAuthenticator.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = FALSE;
+#line 635 "FacebookPublishingAuthenticator.c"
 	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 634 "FacebookPublishingAuthenticator.c"
-		glong _tmp14_;
-		glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 643 "FacebookPublishingAuthenticator.c"
-	} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (end >= ((glong) 0)) {
+#line 641 "FacebookPublishingAuthenticator.c"
+		glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = end <= _tmp7_;
 #line 647 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = FALSE;
+#line 651 "FacebookPublishingAuthenticator.c"
 	}
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 669 "FacebookPublishingAuthenticator.c"
+#line 663 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+                const gchar* old,
+                const gchar* replacement)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 688 "FacebookPublishingAuthenticator.c"
+#line 686 "FacebookPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 695 "FacebookPublishingAuthenticator.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) old)) == '\0';
+#line 690 "FacebookPublishingAuthenticator.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 701 "FacebookPublishingAuthenticator.c"
+#line 696 "FacebookPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp3_;
-		const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 711 "FacebookPublishingAuthenticator.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 700 "FacebookPublishingAuthenticator.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 715 "FacebookPublishingAuthenticator.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 704 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 723 "FacebookPublishingAuthenticator.c"
+#line 712 "FacebookPublishingAuthenticator.c"
 	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		GRegex* _tmp9_;
-		GRegex* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		GRegex* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GRegex* _tmp5_;
+		GRegex* _tmp6_;
+		gchar* _tmp7_ = NULL;
+		GRegex* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 755 "FacebookPublishingAuthenticator.c"
+#line 740 "FacebookPublishingAuthenticator.c"
 				goto __catch0_g_regex_error;
 			}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 764 "FacebookPublishingAuthenticator.c"
+#line 749 "FacebookPublishingAuthenticator.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 780 "FacebookPublishingAuthenticator.c"
+#line 763 "FacebookPublishingAuthenticator.c"
 				goto __catch0_g_regex_error;
 			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 791 "FacebookPublishingAuthenticator.c"
+#line 774 "FacebookPublishingAuthenticator.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 805 "FacebookPublishingAuthenticator.c"
+#line 788 "FacebookPublishingAuthenticator.c"
 	}
 	goto __finally0;
 	__catch0_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 819 "FacebookPublishingAuthenticator.c"
+#line 802 "FacebookPublishingAuthenticator.c"
 	}
 	__finally0:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return NULL;
-#line 830 "FacebookPublishingAuthenticator.c"
+#line 813 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
 	gchar* loaded_url = NULL;
 	WebKitWebView* _tmp0_;
@@ -854,11 +839,8 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 	gchar* _tmp7_;
 	gchar* _tmp8_;
 	const gchar* _tmp9_;
-	gboolean _tmp10_;
-	const gchar* _tmp22_;
-	gboolean _tmp23_;
-	const gchar* _tmp28_;
-	gboolean _tmp29_;
+	const gchar* _tmp20_;
+	const gchar* _tmp25_;
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
 #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -890,109 +872,102 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp9_ = loaded_url;
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp10_ = string_contains (_tmp9_, "?");
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp10_) {
-#line 887 "FacebookPublishingAuthenticator.c"
+	if (string_contains (_tmp9_, "?")) {
+#line 867 "FacebookPublishingAuthenticator.c"
 		gint index = 0;
+		const gchar* _tmp10_;
+		gchar* params = NULL;
 		const gchar* _tmp11_;
 		gint _tmp12_;
-		gchar* params = NULL;
 		const gchar* _tmp13_;
 		gint _tmp14_;
-		const gchar* _tmp15_;
-		gint _tmp16_;
-		gint _tmp17_;
-		gchar* _tmp18_;
-		const gchar* _tmp19_;
-		const gchar* _tmp20_;
-		gchar* _tmp21_;
-#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp11_ = loaded_url;
+		gint _tmp15_;
+		gchar* _tmp16_;
+		const gchar* _tmp17_;
+		const gchar* _tmp18_;
+		gchar* _tmp19_;
 #line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp12_ = string_index_of_char (_tmp11_, (gunichar) '?', 0);
+		_tmp10_ = loaded_url;
 #line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		index = _tmp12_;
+		index = string_index_of_char (_tmp10_, (gunichar) '?', 0);
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp13_ = loaded_url;
+		_tmp11_ = loaded_url;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp14_ = index;
+		_tmp12_ = index;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp15_ = loaded_url;
+		_tmp13_ = loaded_url;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp16_ = strlen (_tmp15_);
+		_tmp14_ = strlen (_tmp13_);
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp17_ = _tmp16_;
+		_tmp15_ = _tmp14_;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp18_ = string_slice (_tmp13_, (glong) _tmp14_, (glong) _tmp17_);
+		_tmp16_ = string_slice (_tmp11_, (glong) _tmp12_, (glong) _tmp15_);
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		params = _tmp18_;
+		params = _tmp16_;
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp19_ = loaded_url;
+		_tmp17_ = loaded_url;
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp20_ = params;
+		_tmp18_ = params;
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp21_ = string_replace (_tmp19_, _tmp20_, "");
+		_tmp19_ = string_replace (_tmp17_, _tmp18_, "");
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (loaded_url);
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		loaded_url = _tmp21_;
+		loaded_url = _tmp19_;
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (params);
-#line 933 "FacebookPublishingAuthenticator.c"
+#line 910 "FacebookPublishingAuthenticator.c"
 	}
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp22_ = loaded_url;
-#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp23_ = string_contains (_tmp22_, "login_success");
+	_tmp20_ = loaded_url;
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp23_) {
-#line 941 "FacebookPublishingAuthenticator.c"
-		WebKitWebView* _tmp24_;
-		WebKitWebView* _tmp25_;
-		const gchar* _tmp26_;
-		const gchar* _tmp27_;
+	if (string_contains (_tmp20_, "login_success")) {
+#line 916 "FacebookPublishingAuthenticator.c"
+		WebKitWebView* _tmp21_;
+		WebKitWebView* _tmp22_;
+		const gchar* _tmp23_;
+		const gchar* _tmp24_;
 #line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty = TRUE;
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp24_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+		_tmp21_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp25_ = _tmp24_;
+		_tmp22_ = _tmp21_;
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp26_ = webkit_web_view_get_uri (_tmp25_);
+		_tmp23_ = webkit_web_view_get_uri (_tmp22_);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp27_ = _tmp26_;
+		_tmp24_ = _tmp23_;
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp27_);
+		g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp24_);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_g_object_unref0 (_tmp25_);
+		_g_object_unref0 (_tmp22_);
 #line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (loaded_url);
 #line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 964 "FacebookPublishingAuthenticator.c"
+#line 939 "FacebookPublishingAuthenticator.c"
 	}
 #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp28_ = loaded_url;
+	_tmp25_ = loaded_url;
 #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp29_ = string_contains (_tmp28_, "login_failure");
-#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp29_) {
+	if (string_contains (_tmp25_, "login_failure")) {
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL], 0);
 #line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (loaded_url);
 #line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 978 "FacebookPublishingAuthenticator.c"
+#line 951 "FacebookPublishingAuthenticator.c"
 	}
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (loaded_url);
-#line 982 "FacebookPublishingAuthenticator.c"
+#line 955 "FacebookPublishingAuthenticator.c"
 }
 
 
-gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void) {
+gboolean
+publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1001,24 +976,26 @@ gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_c
 	result = _tmp0_;
 #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 995 "FacebookPublishingAuthenticator.c"
+#line 970 "FacebookPublishingAuthenticator.c"
 }
 
 
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type,
+                                                                                            const gchar* prefix,
+                                                                                            const gchar* translation,
+                                                                                            const gchar* exception_code,
+                                                                                            const gchar* exception_translation,
+                                                                                            const gchar* exception_code_2,
+                                                                                            const gchar* exception_translation_2)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	const gchar* _tmp4_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	const gchar* _tmp8_;
-	gchar* _tmp9_;
-	const gchar* _tmp10_;
-	gchar* _tmp11_;
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1026,164 +1003,184 @@ static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp0_ = prefix;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (prefix);
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->prefix);
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->prefix = _tmp1_;
-#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp2_ = translation;
+	self->prefix = _tmp0_;
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (translation);
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->translation);
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->translation = _tmp3_;
+	self->translation = _tmp1_;
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp4_ = exception_code;
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (exception_code);
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->exception_code);
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->exception_code = _tmp5_;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp6_ = exception_translation;
+	self->exception_code = _tmp2_;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_tmp3_ = g_strdup (exception_translation);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->exception_translation);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->exception_translation = _tmp7_;
+	self->exception_translation = _tmp3_;
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp8_ = exception_code_2;
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp9_ = g_strdup (_tmp8_);
+	_tmp4_ = g_strdup (exception_code_2);
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->exception_code_2);
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->exception_code_2 = _tmp9_;
-#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp10_ = exception_translation_2;
+	self->exception_code_2 = _tmp4_;
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp11_ = g_strdup (_tmp10_);
+	_tmp5_ = g_strdup (exception_translation_2);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->exception_translation_2);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->exception_translation_2 = _tmp11_;
+	self->exception_translation_2 = _tmp5_;
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 1069 "FacebookPublishingAuthenticator.c"
+#line 1034 "FacebookPublishingAuthenticator.c"
 }
 
 
-static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix,
+                                                                                      const gchar* translation,
+                                                                                      const gchar* exception_code,
+                                                                                      const gchar* exception_translation,
+                                                                                      const gchar* exception_code_2,
+                                                                                      const gchar* exception_translation_2)
+{
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2);
-#line 1076 "FacebookPublishingAuthenticator.c"
+#line 1048 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	value->data[0].v_pointer = NULL;
-#line 1083 "FacebookPublishingAuthenticator.c"
+#line 1057 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer);
-#line 1092 "FacebookPublishingAuthenticator.c"
+#line 1068 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value,
+                                                                                                   GValue* dest_value)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (src_value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		dest_value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer);
-#line 1102 "FacebookPublishingAuthenticator.c"
+#line 1081 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1106 "FacebookPublishingAuthenticator.c"
+#line 1085 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return value->data[0].v_pointer;
-#line 1114 "FacebookPublishingAuthenticator.c"
+#line 1095 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value,
+                                                                                                      guint n_collect_values,
+                                                                                                      GTypeCValue* collect_values,
+                                                                                                      guint collect_flags)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (collect_values[0].v_pointer) {
-#line 1121 "FacebookPublishingAuthenticator.c"
+#line 1107 "FacebookPublishingAuthenticator.c"
 		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * object;
 		object = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1128 "FacebookPublishingAuthenticator.c"
+#line 1114 "FacebookPublishingAuthenticator.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1132 "FacebookPublishingAuthenticator.c"
+#line 1118 "FacebookPublishingAuthenticator.c"
 		}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (object);
-#line 1136 "FacebookPublishingAuthenticator.c"
+#line 1122 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1140 "FacebookPublishingAuthenticator.c"
+#line 1126 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return NULL;
-#line 1144 "FacebookPublishingAuthenticator.c"
+#line 1130 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value,
+                                                                                                    guint n_collect_values,
+                                                                                                    GTypeCValue* collect_values,
+                                                                                                    guint collect_flags)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (!object_p) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1155 "FacebookPublishingAuthenticator.c"
+#line 1146 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (!value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		*object_p = NULL;
-#line 1161 "FacebookPublishingAuthenticator.c"
+#line 1152 "FacebookPublishingAuthenticator.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1165 "FacebookPublishingAuthenticator.c"
+#line 1156 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		*object_p = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 1169 "FacebookPublishingAuthenticator.c"
+#line 1160 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return NULL;
-#line 1173 "FacebookPublishingAuthenticator.c"
+#line 1164 "FacebookPublishingAuthenticator.c"
 }
 
 
-static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name,
+                                                                                             const gchar* nick,
+                                                                                             const gchar* blurb,
+                                                                                             GType object_type,
+                                                                                             GParamFlags flags)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup* spec;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
@@ -1193,20 +1190,25 @@ static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return G_PARAM_SPEC (spec);
-#line 1187 "FacebookPublishingAuthenticator.c"
+#line 1184 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return value->data[0].v_pointer;
-#line 1196 "FacebookPublishingAuthenticator.c"
+#line 1195 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value,
+                                                                                            gpointer v_object)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
@@ -1222,22 +1224,25 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
 		value->data[0].v_pointer = v_object;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 1216 "FacebookPublishingAuthenticator.c"
+#line 1218 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1220 "FacebookPublishingAuthenticator.c"
+#line 1222 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 1226 "FacebookPublishingAuthenticator.c"
+#line 1228 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value,
+                                                                                             gpointer v_object)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * old;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
@@ -1251,38 +1256,44 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = v_object;
-#line 1245 "FacebookPublishingAuthenticator.c"
+#line 1250 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1249 "FacebookPublishingAuthenticator.c"
+#line 1254 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 1255 "FacebookPublishingAuthenticator.c"
+#line 1260 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass * klass)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	((PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize;
-#line 1265 "FacebookPublishingAuthenticator.c"
+#line 1272 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self)
+{
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self->ref_count = 1;
-#line 1272 "FacebookPublishingAuthenticator.c"
+#line 1281 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * obj)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup);
@@ -1300,11 +1311,13 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l
 	_g_free0 (self->exception_code_2);
 #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (self->exception_translation_2);
-#line 1294 "FacebookPublishingAuthenticator.c"
+#line 1305 "FacebookPublishingAuthenticator.c"
 }
 
 
-static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) {
+static GType
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value };
@@ -1318,18 +1331,22 @@ static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_
 }
 
 
-static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
+static gpointer
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return instance;
-#line 1319 "FacebookPublishingAuthenticator.c"
+#line 1334 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1338,12 +1355,14 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l
 		PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1332 "FacebookPublishingAuthenticator.c"
+#line 1349 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_;
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_;
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_;
@@ -1586,25 +1605,31 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_c
 	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table = _tmp45_;
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1 = 45;
-#line 1580 "FacebookPublishingAuthenticator.c"
+#line 1599 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self)
+{
 }
 
 
-static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class)->finalize (obj);
-#line 1594 "FacebookPublishingAuthenticator.c"
+#line 1617 "FacebookPublishingAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init, NULL };
@@ -1616,135 +1641,141 @@ GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_typ
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1613 "FacebookPublishingAuthenticator.c"
+#line 1640 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 1620 "FacebookPublishingAuthenticator.c"
+#line 1649 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 1627 "FacebookPublishingAuthenticator.c"
+#line 1658 "FacebookPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFacebookFacebook*
+publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+                                                               SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self = NULL;
 	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	GHashFunc _tmp2_;
-	GEqualFunc _tmp3_;
-	GHashTable* _tmp4_;
+	GHashFunc _tmp1_;
+	GEqualFunc _tmp2_;
+	GHashTable* _tmp3_;
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = (PublishingAuthenticatorShotwellFacebookFacebook*) g_object_new (object_type, NULL);
 #line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp0_ = host;
-#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (host);
 #line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_object_unref0 (self->priv->host);
 #line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->priv->host = _tmp1_;
+	self->priv->host = _tmp0_;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp2_ = g_str_hash;
+	_tmp1_ = g_str_hash;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp3_ = g_str_equal;
+	_tmp2_ = g_str_equal;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.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 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (self->priv->params);
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	self->priv->params = _tmp4_;
+	self->priv->params = _tmp3_;
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 1662 "FacebookPublishingAuthenticator.c"
+#line 1693 "FacebookPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFacebookFacebook*
+publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host)
+{
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_facebook_facebook_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, host);
-#line 1669 "FacebookPublishingAuthenticator.c"
+#line 1702 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
-	gboolean _tmp0_;
-	gboolean _tmp6_;
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp0_ = publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self);
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp0_) {
-#line 1683 "FacebookPublishingAuthenticator.c"
+	if (publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self)) {
+#line 1714 "FacebookPublishingAuthenticator.c"
 		gchar* access_token = NULL;
-		gchar* _tmp1_;
-		GHashTable* _tmp2_;
-		gchar* _tmp3_;
-		const gchar* _tmp4_;
-		GVariant* _tmp5_;
+		gchar* _tmp0_;
+		GHashTable* _tmp1_;
+		gchar* _tmp2_;
+		const gchar* _tmp3_;
+		GVariant* _tmp4_;
 #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp1_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
+		_tmp0_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
 #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		access_token = _tmp1_;
+		access_token = _tmp0_;
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp2_ = self->priv->params;
+		_tmp1_ = self->priv->params;
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp3_ = g_strdup ("AccessToken");
+		_tmp2_ = g_strdup ("AccessToken");
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp4_ = access_token;
+		_tmp3_ = access_token;
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp5_ = g_variant_new_string (_tmp4_);
+		_tmp4_ = g_variant_new_string (_tmp3_);
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		g_variant_ref_sink (_tmp5_);
+		g_variant_ref_sink (_tmp4_);
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		g_hash_table_insert (_tmp2_, _tmp3_, _tmp5_);
+		g_hash_table_insert (_tmp1_, _tmp2_, _tmp4_);
 #line 183 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
 #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (access_token);
 #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 1712 "FacebookPublishingAuthenticator.c"
+#line 1743 "FacebookPublishingAuthenticator.c"
 	}
 #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp6_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty ();
-#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp6_) {
-#line 1718 "FacebookPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp7_;
-		SpitPublishingPluginHost* _tmp8_;
+	if (publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty ()) {
+#line 1747 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp5_;
+		SpitPublishingPluginHost* _tmp6_;
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp7_ = self->priv->host;
+		_tmp5_ = self->priv->host;
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+		spit_publishing_plugin_host_set_service_locked (_tmp5_, FALSE);
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp8_ = self->priv->host;
+		_tmp6_ = self->priv->host;
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1729 "FacebookPublishingAuthenticator.c"
+		spit_publishing_plugin_host_install_static_message_pane (_tmp6_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1758 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
-#line 1733 "FacebookPublishingAuthenticator.c"
+#line 1762 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 	gboolean result = FALSE;
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1753,18 +1784,22 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_log
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 1747 "FacebookPublishingAuthenticator.c"
+#line 1778 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 1754 "FacebookPublishingAuthenticator.c"
+#line 1787 "FacebookPublishingAuthenticator.c"
 }
 
 
-static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 	GHashTable* result = NULL;
 	GHashTable* _tmp0_;
@@ -1779,11 +1814,13 @@ static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_
 	result = _tmp1_;
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 1773 "FacebookPublishingAuthenticator.c"
+#line 1808 "FacebookPublishingAuthenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+void
+publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1791,29 +1828,35 @@ void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_s
 "session.");
 #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, "");
-#line 1784 "FacebookPublishingAuthenticator.c"
+#line 1821 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (self);
-#line 1794 "FacebookPublishingAuthenticator.c"
+#line 1833 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
-#line 1802 "FacebookPublishingAuthenticator.c"
+#line 1843 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static gboolean
+publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 	gboolean result = FALSE;
 	gchar* token = NULL;
 	gchar* _tmp0_;
@@ -1829,19 +1872,19 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten
 	_tmp1_ = token;
 #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp1_ != NULL) {
-#line 1822 "FacebookPublishingAuthenticator.c"
+#line 1865 "FacebookPublishingAuthenticator.c"
 		const gchar* _tmp2_;
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp2_ = token;
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		g_debug ("FacebookPublishingAuthenticator.vala:223: existing Facebook session fo" \
 "und in configuration database (access_token = %s).", _tmp2_);
-#line 1828 "FacebookPublishingAuthenticator.c"
+#line 1871 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		g_debug ("FacebookPublishingAuthenticator.vala:226: no existing Facebook session" \
 " available.");
-#line 1832 "FacebookPublishingAuthenticator.c"
+#line 1875 "FacebookPublishingAuthenticator.c"
 	}
 #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp3_ = token;
@@ -1851,11 +1894,13 @@ static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persisten
 	_g_free0 (token);
 #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 1842 "FacebookPublishingAuthenticator.c"
+#line 1885 "FacebookPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static gchar*
+publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -1869,13 +1914,15 @@ static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 1860 "FacebookPublishingAuthenticator.c"
+#line 1905 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                                 const gchar* access_token)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1883,21 +1930,23 @@ static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_a
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = self->priv->host;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp1_ = access_token;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_);
-#line 1877 "FacebookPublishingAuthenticator.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", access_token);
+#line 1922 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self)
+{
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_on_login_clicked ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
-#line 1884 "FacebookPublishingAuthenticator.c"
+#line 1931 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1913,11 +1962,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_
 	_tmp1_ = self->priv->host;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
-#line 1903 "FacebookPublishingAuthenticator.c"
+#line 1952 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1925,25 +1976,34 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked
 "on welcome pane.");
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (self);
-#line 1914 "FacebookPublishingAuthenticator.c"
+#line 1965 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+                                                                                                                                                                          const gchar* success_url,
+                                                                                                                                                                          gpointer self)
+{
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded ((PublishingAuthenticatorShotwellFacebookFacebook*) self, success_url);
-#line 1921 "FacebookPublishingAuthenticator.c"
+#line 1976 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender,
+                                                                                                                                                                    gpointer self)
+{
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
-#line 1928 "FacebookPublishingAuthenticator.c"
+#line 1986 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_;
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_;
@@ -1979,12 +2039,14 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_au
 	_tmp5_ = self->priv->web_auth_pane;
 #line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1967 "FacebookPublishingAuthenticator.c"
+#line 2027 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                                      const gchar* success_url)
+{
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1993,14 +2055,14 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane
 	g_debug ("FacebookPublishingAuthenticator.vala:267: EVENT: hosted web login succ" \
 "eeded.");
 #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp0_ = success_url;
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, _tmp0_);
-#line 1983 "FacebookPublishingAuthenticator.c"
+	publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, success_url);
+#line 2043 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self)
+{
 #line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2008,234 +2070,223 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane
 "ed.");
 #line 281 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
-#line 1994 "FacebookPublishingAuthenticator.c"
+#line 2056 "FacebookPublishingAuthenticator.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 2021 "FacebookPublishingAuthenticator.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 2081 "FacebookPublishingAuthenticator.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 2029 "FacebookPublishingAuthenticator.c"
+#line 2089 "FacebookPublishingAuthenticator.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 2035 "FacebookPublishingAuthenticator.c"
+#line 2095 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self,
+                                                                             const gchar* good_login_uri)
+{
 	gchar* decoded_uri = NULL;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gchar* _tmp0_;
 	gchar* access_token = NULL;
 	gint index = 0;
-	const gchar* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	const gchar* _tmp12_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp9_;
 	gchar* trailing_params = NULL;
-	const gchar* _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
+	const gchar* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp21_;
 	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	GHashTable* _tmp27_;
+	gchar* _tmp28_;
 	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	GHashTable* _tmp31_;
-	gchar* _tmp32_;
-	const gchar* _tmp33_;
-	GVariant* _tmp34_;
-	const gchar* _tmp35_;
+	GVariant* _tmp30_;
+	const gchar* _tmp31_;
 #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (good_login_uri != NULL);
 #line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp0_ = good_login_uri;
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_debug ("FacebookPublishingAuthenticator.vala:285: ACTION: preparing to extract" \
-" session information encoded in uri = '%s'", _tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp1_ = good_login_uri;
+" session information encoded in uri = '%s'", good_login_uri);
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp2_ = soup_uri_decode (_tmp1_);
+	_tmp0_ = soup_uri_decode (good_login_uri);
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	decoded_uri = _tmp2_;
+	decoded_uri = _tmp0_;
 #line 292 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	access_token = NULL;
 #line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp3_ = decoded_uri;
+	_tmp1_ = decoded_uri;
 #line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp4_ = string_index_of (_tmp3_, "#access_token=", 0);
-#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	index = _tmp4_;
+	index = string_index_of (_tmp1_, "#access_token=", 0);
 #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp5_ = index;
+	_tmp2_ = index;
 #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp5_ >= 0) {
-#line 2089 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp6_;
+	if (_tmp2_ >= 0) {
+#line 2142 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp3_;
+		gint _tmp4_;
+		const gchar* _tmp5_;
+		gint _tmp6_;
 		gint _tmp7_;
-		const gchar* _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-		gchar* _tmp11_;
+		gchar* _tmp8_;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp6_ = decoded_uri;
+		_tmp3_ = decoded_uri;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp7_ = index;
+		_tmp4_ = index;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp8_ = decoded_uri;
+		_tmp5_ = decoded_uri;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp9_ = strlen (_tmp8_);
+		_tmp6_ = strlen (_tmp5_);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp10_ = _tmp9_;
+		_tmp7_ = _tmp6_;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp11_ = string_slice (_tmp6_, (glong) _tmp7_, (glong) _tmp10_);
+		_tmp8_ = string_slice (_tmp3_, (glong) _tmp4_, (glong) _tmp7_);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (access_token);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		access_token = _tmp11_;
-#line 2112 "FacebookPublishingAuthenticator.c"
+		access_token = _tmp8_;
+#line 2165 "FacebookPublishingAuthenticator.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp12_ = access_token;
+	_tmp9_ = access_token;
 #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp12_ == NULL) {
-#line 2118 "FacebookPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp13_;
-		GError* _tmp14_;
-		GError* _tmp15_;
+	if (_tmp9_ == NULL) {
+#line 2171 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp10_;
+		GError* _tmp11_;
+		GError* _tmp12_;
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp13_ = self->priv->host;
+		_tmp10_ = self->priv->host;
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
+		_tmp11_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp15_ = _tmp14_;
+		_tmp12_ = _tmp11_;
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp15_);
+		spit_publishing_plugin_host_post_error (_tmp10_, _tmp12_);
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp15_);
+		_g_error_free0 (_tmp12_);
 #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (access_token);
 #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (decoded_uri);
 #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 2138 "FacebookPublishingAuthenticator.c"
+#line 2191 "FacebookPublishingAuthenticator.c"
 	}
 #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	trailing_params = NULL;
 #line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp16_ = access_token;
+	_tmp13_ = access_token;
 #line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp17_ = string_index_of_char (_tmp16_, (gunichar) '&', 0);
-#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	index = _tmp17_;
+	index = string_index_of_char (_tmp13_, (gunichar) '&', 0);
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp18_ = index;
+	_tmp14_ = index;
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp18_ >= 0) {
-#line 2152 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp19_;
-		gint _tmp20_;
-		const gchar* _tmp21_;
-		gint _tmp22_;
-		gint _tmp23_;
-		gchar* _tmp24_;
+	if (_tmp14_ >= 0) {
+#line 2203 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp15_;
+		gint _tmp16_;
+		const gchar* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		gchar* _tmp20_;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp19_ = access_token;
+		_tmp15_ = access_token;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp20_ = index;
+		_tmp16_ = index;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp21_ = access_token;
+		_tmp17_ = access_token;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp22_ = strlen (_tmp21_);
+		_tmp18_ = strlen (_tmp17_);
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp23_ = _tmp22_;
+		_tmp19_ = _tmp18_;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp24_ = string_slice (_tmp19_, (glong) _tmp20_, (glong) _tmp23_);
+		_tmp20_ = string_slice (_tmp15_, (glong) _tmp16_, (glong) _tmp19_);
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (trailing_params);
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		trailing_params = _tmp24_;
-#line 2175 "FacebookPublishingAuthenticator.c"
+		trailing_params = _tmp20_;
+#line 2226 "FacebookPublishingAuthenticator.c"
 	}
 #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp25_ = trailing_params;
+	_tmp21_ = trailing_params;
 #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	if (_tmp25_ != NULL) {
-#line 2181 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp26_;
-		const gchar* _tmp27_;
-		gchar* _tmp28_;
+	if (_tmp21_ != NULL) {
+#line 2232 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp22_;
+		const gchar* _tmp23_;
+		gchar* _tmp24_;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp26_ = access_token;
+		_tmp22_ = access_token;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp27_ = trailing_params;
+		_tmp23_ = trailing_params;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		_tmp28_ = string_replace (_tmp26_, _tmp27_, "");
+		_tmp24_ = string_replace (_tmp22_, _tmp23_, "");
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (access_token);
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		access_token = _tmp28_;
-#line 2195 "FacebookPublishingAuthenticator.c"
+		access_token = _tmp24_;
+#line 2246 "FacebookPublishingAuthenticator.c"
 	}
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp29_ = access_token;
+	_tmp25_ = access_token;
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp30_ = string_replace (_tmp29_, "#access_token=", "");
+	_tmp26_ = string_replace (_tmp25_, "#access_token=", "");
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (access_token);
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	access_token = _tmp30_;
+	access_token = _tmp26_;
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp31_ = self->priv->params;
+	_tmp27_ = self->priv->params;
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp32_ = g_strdup ("AccessToken");
+	_tmp28_ = g_strdup ("AccessToken");
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp33_ = access_token;
+	_tmp29_ = access_token;
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp34_ = g_variant_new_string (_tmp33_);
+	_tmp30_ = g_variant_new_string (_tmp29_);
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	g_variant_ref_sink (_tmp34_);
+	g_variant_ref_sink (_tmp30_);
 #line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp31_, _tmp32_, _tmp34_);
+	g_hash_table_insert (_tmp27_, _tmp28_, _tmp30_);
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	_tmp35_ = access_token;
+	_tmp31_ = access_token;
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, _tmp35_);
+	publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, _tmp31_);
 #line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
 #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2244,22 +2295,26 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 	_g_free0 (access_token);
 #line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (decoded_uri);
-#line 2229 "FacebookPublishingAuthenticator.c"
+#line 2280 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_class_init (PublishingAuthenticatorShotwellFacebookFacebookClass * klass) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_class_init (PublishingAuthenticatorShotwellFacebookFacebookClass * klass)
+{
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_parent_class = g_type_class_peek_parent (klass);
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFacebookFacebookPrivate));
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_facebook_finalize;
-#line 2240 "FacebookPublishingAuthenticator.c"
+#line 2293 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2272,20 +2327,24 @@ static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_
 	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_logout;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_refresh;
-#line 2257 "FacebookPublishingAuthenticator.c"
+#line 2312 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_instance_init (PublishingAuthenticatorShotwellFacebookFacebook * self) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_instance_init (PublishingAuthenticatorShotwellFacebookFacebook * self)
+{
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE (self);
 #line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self->priv->web_auth_pane = NULL;
-#line 2266 "FacebookPublishingAuthenticator.c"
+#line 2323 "FacebookPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_facebook_facebook_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
@@ -2297,11 +2356,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObjec
 	_g_hash_table_unref0 (self->priv->params);
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_facebook_parent_class)->finalize (obj);
-#line 2282 "FacebookPublishingAuthenticator.c"
+#line 2341 "FacebookPublishingAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) {
+GType
+publishing_authenticator_shotwell_facebook_facebook_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_facebook_facebook_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_facebook_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookFacebookClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_facebook_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookFacebook), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_facebook_instance_init, NULL };
@@ -2315,7 +2376,11 @@ GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -2327,13 +2392,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
 
 
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
 	int length;
 	length = 0;
 	if (array) {
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index cfeb019..bdee2ff 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FlickrPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* FlickrPublishingAuthenticator.c generated by valac 0.40.4, the Vala compiler
  * generated from FlickrPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -52,15 +53,20 @@ typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction
 typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPane PublishingAuthenticatorShotwellFlickrWebAuthenticationPane;
 typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass;
 typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_flickr_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL,
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
@@ -83,6 +89,11 @@ typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate Publis
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickr PublishingAuthenticatorShotwellFlickrFlickr;
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickrClass PublishingAuthenticatorShotwellFlickrFlickrClass;
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickrPrivate PublishingAuthenticatorShotwellFlickrFlickrPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_flickr_flickr_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_NUM_PROPERTIES];
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
@@ -157,41 +168,41 @@ static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = N
 "Click Log in to log into Flickr in your Web browser. You will have to " \
 "authorize Shotwell Connect to link to your Flickr account.")
 GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
 PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session);
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type,
+                                                                                                                                                              PublishingRESTSupportOAuth1Session* session);
 GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                                                                               const gchar* user_verifier);
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type,
+                                                                                                                                                     PublishingRESTSupportOAuth1Session* session,
+                                                                                                                                                     const gchar* user_verifier);
 GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=w" \
 "rite"
 PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token);
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token);
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type,
+                                                                                                                                        const gchar* token);
 static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base);
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request);
-static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self,
+                                                                                                   WebKitURISchemeRequest* request);
+static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+                                                                                                                                        gpointer self);
 static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 static void _vala_SoupURI_free (SoupURI* self);
-static guint8* _vala_array_dup1 (guint8* self, int length);
+static guint8* _vala_array_dup1 (guint8* self,
+                          int length);
 static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj);
 GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_DUMMY_PROPERTY
-};
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+                                                                                                                      const gchar* api_key,
+                                                                                                                      const gchar* api_secret,
+                                                                                                                      SpitPublishingPluginHost* host);
 static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
 gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
@@ -205,60 +216,89 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (Publis
 static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self);
 static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
-static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret);
-static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token);
-static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin);
-static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                PublishingRESTSupportTransaction* txn,
+                                                                                GError* err);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                   GError* err,
+                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                            const gchar* response);
+static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                        const gchar* token,
+                                                                                        const gchar* token_secret);
+static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                            const gchar* token);
+static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                    const gchar* pin);
+static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+                                                                                                                                                 const gchar* auth_code,
+                                                                                                                                                 gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
-
-
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+                                                                                                                                                 gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                          PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                         gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                  PublishingRESTSupportTransaction* txn,
+                                                                                  GError* err);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                     GError* err,
+                                                                                                                                     gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                                       const gchar* response);
+
+
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type,
+                                                                                       PublishingRESTSupportOAuth1Session* session)
+{
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
-	PublishingRESTSupportOAuth1Session* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = session;
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 236 "FlickrPublishingAuthenticator.c"
+#line 268 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 243 "FlickrPublishingAuthenticator.c"
+#line 277 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass)
+{
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 250 "FlickrPublishingAuthenticator.c"
+#line 286 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction * self) {
+static void
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init, NULL };
@@ -270,62 +310,66 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
 }
 
 
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type,
+                                                                                   PublishingRESTSupportOAuth1Session* session,
+                                                                                   const gchar* user_verifier)
+{
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL;
-	PublishingRESTSupportOAuth1Session* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportOAuth1Session* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (user_verifier != NULL, NULL);
 #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = session;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+	self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = user_verifier;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = session;
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", user_verifier);
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = publishing_rest_support_oauth1_session_get_request_phase_token (_tmp2_);
+	_tmp0_ = publishing_rest_support_oauth1_session_get_request_phase_token (session);
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp1_);
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp1_);
 #line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 303 "FlickrPublishingAuthenticator.c"
+#line 338 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                             const gchar* user_verifier)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 310 "FlickrPublishingAuthenticator.c"
+#line 348 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass)
+{
 #line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 317 "FlickrPublishingAuthenticator.c"
+#line 357 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init, NULL };
@@ -337,51 +381,60 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge
 }
 
 
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token) {
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*
+publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type,
+                                                                            const gchar* token)
+{
 	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (token != NULL, NULL);
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup_printf (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI, _tmp0_);
+	_tmp0_ = g_strdup_printf (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI, token);
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp2_, NULL);
+	self = (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp1_, NULL);
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 356 "FlickrPublishingAuthenticator.c"
+#line 400 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token) {
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*
+publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token)
+{
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, token);
-#line 363 "FlickrPublishingAuthenticator.c"
+#line 409 "FlickrPublishingAuthenticator.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 370 "FlickrPublishingAuthenticator.c"
+#line 418 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+                                                                                                                                   gpointer self)
+{
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb ((PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) self, request);
-#line 377 "FlickrPublishingAuthenticator.c"
+#line 428 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base)
+{
 	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
 	WebKitWebContext* ctx = NULL;
 	WebKitWebContext* _tmp0_;
@@ -400,18 +453,22 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_rea
 	webkit_web_context_register_uri_scheme (ctx, "shotwell-auth", _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback, g_object_ref (self), g_object_unref);
 #line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_object_unref0 (ctx);
-#line 400 "FlickrPublishingAuthenticator.c"
+#line 453 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
 #line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 407 "FlickrPublishingAuthenticator.c"
+#line 462 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
+{
 	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
 	SoupURI* uri = NULL;
 	WebKitWebView* _tmp0_;
@@ -445,43 +502,46 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_rea
 	_tmp7_ = _tmp6_->scheme;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (g_strcmp0 (_tmp7_, "shotwell-auth") == 0) {
-#line 445 "FlickrPublishingAuthenticator.c"
+#line 502 "FlickrPublishingAuthenticator.c"
 		const gchar* _tmp8_;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp8_ = self->priv->auth_code;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp5_ = _tmp8_ == NULL;
-#line 451 "FlickrPublishingAuthenticator.c"
+#line 508 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp5_ = FALSE;
-#line 455 "FlickrPublishingAuthenticator.c"
+#line 512 "FlickrPublishingAuthenticator.c"
 	}
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp5_) {
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL], 0);
-#line 461 "FlickrPublishingAuthenticator.c"
+#line 518 "FlickrPublishingAuthenticator.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp9_ = self->priv->auth_code;
 #line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp9_ != NULL) {
-#line 467 "FlickrPublishingAuthenticator.c"
+#line 524 "FlickrPublishingAuthenticator.c"
 		const gchar* _tmp10_;
 #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp10_ = self->priv->auth_code;
 #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp10_);
-#line 473 "FlickrPublishingAuthenticator.c"
+#line 530 "FlickrPublishingAuthenticator.c"
 	}
 #line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	__vala_SoupURI_free0 (uri);
-#line 477 "FlickrPublishingAuthenticator.c"
+#line 534 "FlickrPublishingAuthenticator.c"
 }
 
 
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+                 int* result_length1)
+{
 	guint8* result;
 	guint8* res = NULL;
 	gint res_length1;
@@ -493,120 +553,120 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1;
 	guint8* _tmp4_;
 	gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 521 "FlickrPublishingAuthenticator.c"
+#line 581 "FlickrPublishingAuthenticator.c"
 	}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 527 "FlickrPublishingAuthenticator.c"
+#line 587 "FlickrPublishingAuthenticator.c"
 }
 
 
-static guint8* _vala_array_dup1 (guint8* self, int length) {
+static guint8*
+_vala_array_dup1 (guint8* self,
+                  int length)
+{
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 534 "FlickrPublishingAuthenticator.c"
+#line 597 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self,
+                                                                                              WebKitURISchemeRequest* request)
+{
 	SoupURI* uri = NULL;
-	WebKitURISchemeRequest* _tmp0_;
-	const gchar* _tmp1_;
-	SoupURI* _tmp2_;
+	const gchar* _tmp0_;
+	SoupURI* _tmp1_;
 	GHashTable* form_data = NULL;
-	const gchar* _tmp3_;
-	GHashTable* _tmp4_;
-	gconstpointer _tmp5_;
-	gchar* _tmp6_;
+	const gchar* _tmp2_;
+	GHashTable* _tmp3_;
+	gconstpointer _tmp4_;
+	gchar* _tmp5_;
 	gchar* response = NULL;
-	gchar* _tmp7_;
+	gchar* _tmp6_;
 	GMemoryInputStream* mins = NULL;
+	guint8* _tmp7_;
+	gint _tmp7__length1;
 	guint8* _tmp8_;
 	gint _tmp8__length1;
 	guint8* _tmp9_;
 	gint _tmp9__length1;
-	guint8* _tmp10_;
-	gint _tmp10__length1;
-	GMemoryInputStream* _tmp11_;
-	WebKitURISchemeRequest* _tmp12_;
+	GMemoryInputStream* _tmp10_;
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_WEB_AUTHENTICATION_PANE (self));
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (WEBKIT_IS_URI_SCHEME_REQUEST (request));
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = request;
+	_tmp0_ = webkit_uri_scheme_request_get_uri (request);
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = webkit_uri_scheme_request_get_uri (_tmp0_);
+	_tmp1_ = soup_uri_new (_tmp0_);
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = soup_uri_new (_tmp1_);
-#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	uri = _tmp2_;
+	uri = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = uri->query;
+	_tmp2_ = uri->query;
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = soup_form_decode (_tmp3_);
+	_tmp3_ = soup_form_decode (_tmp2_);
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	form_data = _tmp4_;
+	form_data = _tmp3_;
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = g_hash_table_lookup (form_data, "oauth_verifier");
+	_tmp4_ = g_hash_table_lookup (form_data, "oauth_verifier");
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = g_strdup ((const gchar*) _tmp5_);
+	_tmp5_ = g_strdup ((const gchar*) _tmp4_);
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (self->priv->auth_code);
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->auth_code = _tmp6_;
+	self->priv->auth_code = _tmp5_;
 #line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = g_strdup ("");
+	_tmp6_ = g_strdup ("");
 #line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	response = _tmp7_;
+	response = _tmp6_;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = string_get_data (response, &_tmp8__length1);
+	_tmp7_ = string_get_data (response, &_tmp7__length1);
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup1 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10__length1 = _tmp9__length1;
+	_tmp9__length1 = _tmp8__length1;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp10_, _tmp10__length1, NULL);
+	_tmp10_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp9_, _tmp9__length1, NULL);
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	mins = _tmp11_;
-#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = request;
+	mins = _tmp10_;
 #line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	webkit_uri_scheme_request_finish (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
+	webkit_uri_scheme_request_finish (request, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_object_unref0 (mins);
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -615,11 +675,13 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_
 	_g_hash_table_unref0 (form_data);
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	__vala_SoupURI_free0 (uri);
-#line 615 "FlickrPublishingAuthenticator.c"
+#line 675 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass * klass)
+{
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -634,20 +696,24 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_cla
 	publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL] = g_signal_new ("error", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 634 "FlickrPublishingAuthenticator.c"
+#line 696 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self)
+{
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->auth_code = NULL;
-#line 643 "FlickrPublishingAuthenticator.c"
+#line 707 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane);
@@ -655,11 +721,13 @@ static void publishing_authenticator_shotwell_flickr_web_authentication_pane_fin
 	_g_free0 (self->priv->auth_code);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class)->finalize (obj);
-#line 655 "FlickrPublishingAuthenticator.c"
+#line 721 "FlickrPublishingAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init, NULL };
@@ -671,83 +739,86 @@ GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type
 }
 
 
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFlickrFlickr*
+publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+                                                           SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
-	SpitPublishingPluginHost* _tmp0_;
 #line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = host;
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrFlickr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET, _tmp0_);
+	self = (PublishingAuthenticatorShotwellFlickrFlickr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET, host);
 #line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 682 "FlickrPublishingAuthenticator.c"
+#line 750 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellFlickrFlickr*
+publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host)
+{
 #line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
-#line 689 "FlickrPublishingAuthenticator.c"
+#line 759 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	gboolean _tmp0_;
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
 #line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp0_) {
-#line 702 "FlickrPublishingAuthenticator.c"
-		PublishingRESTSupportOAuth1Session* _tmp1_;
+	if (publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))) {
+#line 771 "FlickrPublishingAuthenticator.c"
+		PublishingRESTSupportOAuth1Session* _tmp0_;
+		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
-		gchar* _tmp7_;
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_debug ("FlickrPublishingAuthenticator.vala:84: attempt start: a persistent ses" \
 "sion is available; using it");
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+		_tmp1_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+		_tmp3_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+		_tmp5_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
+		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp0_, _tmp2_, _tmp4_, _tmp6_);
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp6_);
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp4_);
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp3_);
-#line 734 "FlickrPublishingAuthenticator.c"
+		_g_free0 (_tmp2_);
+#line 803 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_debug ("FlickrPublishingAuthenticator.vala:89: attempt start: no persistent se" \
 "ssion available; showing login welcome pane");
 #line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
-#line 740 "FlickrPublishingAuthenticator.c"
+#line 809 "FlickrPublishingAuthenticator.c"
 	}
 }
 
 
-static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 	gboolean result = FALSE;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -756,11 +827,13 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout
 	result = TRUE;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 754 "FlickrPublishingAuthenticator.c"
+#line 825 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 	PublishingRESTSupportOAuth1Session* _tmp0_;
 #line 98 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -771,26 +844,32 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_logout (Publish
 	publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 769 "FlickrPublishingAuthenticator.c"
+#line 842 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 777 "FlickrPublishingAuthenticator.c"
+#line 852 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self)
+{
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 784 "FlickrPublishingAuthenticator.c"
+#line 861 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -806,11 +885,13 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcom
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback, self);
-#line 803 "FlickrPublishingAuthenticator.c"
+#line 882 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -818,25 +899,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_logi
 "tton in the welcome pane");
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
-#line 814 "FlickrPublishingAuthenticator.c"
+#line 895 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                              gpointer self)
+{
 #line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 821 "FlickrPublishingAuthenticator.c"
+#line 905 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                              GError* err,
+                                                                                                                              gpointer self)
+{
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 828 "FlickrPublishingAuthenticator.c"
+#line 916 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
@@ -866,7 +956,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 861 "FlickrPublishingAuthenticator.c"
+#line 951 "FlickrPublishingAuthenticator.c"
 	{
 #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -874,7 +964,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 869 "FlickrPublishingAuthenticator.c"
+#line 959 "FlickrPublishingAuthenticator.c"
 				goto __catch1_spit_publishing_publishing_error;
 			}
 #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -885,7 +975,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 			g_clear_error (&_inner_error_);
 #line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 880 "FlickrPublishingAuthenticator.c"
+#line 970 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally1;
@@ -906,7 +996,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 901 "FlickrPublishingAuthenticator.c"
+#line 991 "FlickrPublishingAuthenticator.c"
 	}
 	__finally1:
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -919,219 +1009,198 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		g_clear_error (&_inner_error_);
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 914 "FlickrPublishingAuthenticator.c"
+#line 1004 "FlickrPublishingAuthenticator.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 918 "FlickrPublishingAuthenticator.c"
+#line 1008 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = txn;
+	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_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_auth_request_txn_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_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:141: EVENT: OAuth authentication re" \
-"quest transaction completed; response = '%s'", _tmp6_);
+"quest transaction completed; response = '%s'", _tmp3_);
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = txn;
+	_g_free0 (_tmp3_);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+	_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = _tmp8_;
+	_tmp5_ = _tmp4_;
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_);
+	publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp5_);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp9_);
-#line 969 "FlickrPublishingAuthenticator.c"
+	_g_free0 (_tmp5_);
+#line 1050 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                           PublishingRESTSupportTransaction* txn,
+                                                                           GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GError* _tmp5_;
+	SpitPublishingPluginHost* _tmp2_;
 #line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = txn;
-#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = txn;
+	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_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_auth_request_txn_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_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
 #line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:152: EVENT: OAuth authentication re" \
 "quest transaction caused a network error");
 #line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
-#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = err;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+	spit_publishing_plugin_host_post_error (_tmp2_, err);
 #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1006 "FlickrPublishingAuthenticator.c"
+#line 1082 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                       const gchar* response)
+{
 	gchar* oauth_token = NULL;
 	gchar* oauth_token_secret = NULL;
 	GHashTable* data = NULL;
-	const gchar* _tmp1_;
-	GHashTable* _tmp2_;
-	GHashTable* _tmp3_;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_;
-	GHashTable* _tmp6_;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_;
-	const gchar* _tmp16_;
-	const gchar* _tmp17_;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
+	gconstpointer _tmp2_ = NULL;
+	gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gconstpointer _tmp5_ = NULL;
+	gchar* _tmp6_;
+	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp8_;
+	const gchar* _tmp13_;
+	const gchar* _tmp14_;
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (response != NULL);
 #line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = response;
-#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:159: ACTION: parsing authorization " \
-"request response '%s' into token and secret", _tmp0_);
+"request response '%s' into token and secret", response);
 #line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token = NULL;
 #line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token_secret = NULL;
 #line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = response;
+	_tmp0_ = soup_form_decode (response);
 #line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
-#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	data = _tmp2_;
+	data = _tmp0_;
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = data;
+	_tmp1_ = data;
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+	g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token);
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	oauth_token = _tmp5_;
+	oauth_token = _tmp3_;
 #line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = data;
+	_tmp4_ = data;
 #line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+	g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
 #line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token_secret);
 #line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp6_ = g_strdup (_tmp5_);
 #line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	oauth_token_secret = _tmp8_;
+	oauth_token_secret = _tmp6_;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = oauth_token;
+	_tmp8_ = oauth_token;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp10_ == NULL) {
+	if (_tmp8_ == NULL) {
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp9_ = TRUE;
-#line 1071 "FlickrPublishingAuthenticator.c"
+		_tmp7_ = TRUE;
+#line 1144 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp11_;
+		const gchar* _tmp9_;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp11_ = oauth_token_secret;
+		_tmp9_ = oauth_token_secret;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp9_ = _tmp11_ == NULL;
-#line 1078 "FlickrPublishingAuthenticator.c"
+		_tmp7_ = _tmp9_ == NULL;
+#line 1151 "FlickrPublishingAuthenticator.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp9_) {
-#line 1082 "FlickrPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp12_;
-		const gchar* _tmp13_;
-		GError* _tmp14_;
-		GError* _tmp15_;
-#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	if (_tmp7_) {
+#line 1155 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp10_;
+		GError* _tmp11_;
+		GError* _tmp12_;
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp13_ = response;
+		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp14_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp13_);
+		_tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", response);
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp15_ = _tmp14_;
+		_tmp12_ = _tmp11_;
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
+		spit_publishing_plugin_host_post_error (_tmp10_, _tmp12_);
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp15_);
-#line 1099 "FlickrPublishingAuthenticator.c"
+		_g_error_free0 (_tmp12_);
+#line 1169 "FlickrPublishingAuthenticator.c"
 	}
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp16_ = oauth_token;
+	_tmp13_ = oauth_token;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp17_ = oauth_token_secret;
+	_tmp14_ = oauth_token_secret;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (self, _tmp16_, _tmp17_);
+	publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (self, _tmp13_, _tmp14_);
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (data);
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token_secret);
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token);
-#line 1113 "FlickrPublishingAuthenticator.c"
+#line 1183 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportOAuth1Session* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                   const gchar* token,
+                                                                                   const gchar* token_secret)
+{
+	PublishingRESTSupportOAuth1Session* _tmp0_;
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1139,72 +1208,71 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_to
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (token_secret != NULL);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = token_secret;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:177: EVENT: OAuth authentication to" \
-"ken (%s) and token secret (%s) available", _tmp0_, _tmp1_);
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+"ken (%s) and token secret (%s) available", token, token_secret);
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = token;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = token_secret;
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_oauth1_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
-#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = token;
+	publishing_rest_support_oauth1_session_set_request_phase_credentials (_tmp0_, token, token_secret);
 #line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (self, _tmp5_);
-#line 1148 "FlickrPublishingAuthenticator.c"
+	publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (self, token);
+#line 1207 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+                                                                                                                                            const gchar* auth_code,
+                                                                                                                                            gpointer self)
+{
 #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_verify_pin ((PublishingAuthenticatorShotwellFlickrFlickr*) self, auth_code);
-#line 1155 "FlickrPublishingAuthenticator.c"
+#line 1218 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender,
+                                                                                                                                            gpointer self)
+{
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_web_login_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 1162 "FlickrPublishingAuthenticator.c"
+#line 1228 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                       const gchar* token)
+{
 	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* pane = NULL;
-	const gchar* _tmp0_;
-	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (token != NULL);
 #line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = publishing_authenticator_shotwell_flickr_web_authentication_pane_new (_tmp0_);
+	_tmp0_ = publishing_authenticator_shotwell_flickr_web_authentication_pane_new (token);
 #line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	pane = _tmp1_;
+	pane = _tmp0_;
 #line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (pane, "authorized", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized, self, 0);
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (pane, "error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error, self, 0);
 #line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_object_unref0 (pane);
-#line 1191 "FlickrPublishingAuthenticator.c"
+#line 1257 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	GError* _tmp1_;
 	GError* _tmp2_;
@@ -1220,63 +1288,67 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (
 	spit_publishing_plugin_host_post_error (_tmp0_, _tmp2_);
 #line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_error_free0 (_tmp2_);
-#line 1211 "FlickrPublishingAuthenticator.c"
+#line 1279 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                    gpointer self)
+{
 #line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 1218 "FlickrPublishingAuthenticator.c"
+#line 1289 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                GError* err,
+                                                                                                                                gpointer self)
+{
 #line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 1225 "FlickrPublishingAuthenticator.c"
+#line 1300 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                               const gchar* pin)
+{
+	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
-	PublishingRESTSupportOAuth1Session* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (pin != NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = pin;
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:197: ACTION: validating authorizati" \
-"on PIN %s", _tmp0_);
+"on PIN %s", pin);
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
 #line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = pin;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_);
+	_tmp3_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp2_, pin);
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	txn = _tmp5_;
+	txn = _tmp3_;
 #line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1266 "FlickrPublishingAuthenticator.c"
+#line 1338 "FlickrPublishingAuthenticator.c"
 	{
 #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1284,7 +1356,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1274 "FlickrPublishingAuthenticator.c"
+#line 1346 "FlickrPublishingAuthenticator.c"
 				goto __catch2_spit_publishing_publishing_error;
 			}
 #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1295,28 +1367,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 			g_clear_error (&_inner_error_);
 #line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 1285 "FlickrPublishingAuthenticator.c"
+#line 1357 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally2;
 	__catch2_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_;
-		GError* _tmp7_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		err = _inner_error_;
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = err;
+		_tmp5_ = err;
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1306 "FlickrPublishingAuthenticator.c"
+#line 1378 "FlickrPublishingAuthenticator.c"
 	}
 	__finally2:
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1329,125 +1401,113 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 		g_clear_error (&_inner_error_);
 #line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 1319 "FlickrPublishingAuthenticator.c"
+#line 1391 "FlickrPublishingAuthenticator.c"
 	}
 #line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 1323 "FlickrPublishingAuthenticator.c"
+#line 1395 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                     PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = txn;
+	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_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_access_token_fetch_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_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 217 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:217: EVENT: fetching OAuth access t" \
 "oken over the network succeeded");
 #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp3_ = _tmp2_;
 #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp3_);
 #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_);
-#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 1363 "FlickrPublishingAuthenticator.c"
+	_g_free0 (_tmp3_);
+#line 1429 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                             PublishingRESTSupportTransaction* txn,
+                                                                             GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GError* _tmp5_;
+	SpitPublishingPluginHost* _tmp2_;
 #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = txn;
-#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_access_token_fetch_txn_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_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_flickr_flickr_on_access_token_fetch_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_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:227: EVENT: fetching OAuth access t" \
 "oken over the network caused an error.");
 #line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
-#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = err;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+	spit_publishing_plugin_host_post_error (_tmp2_, err);
 #line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1400 "FlickrPublishingAuthenticator.c"
+#line 1461 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self,
+                                                                                                  const gchar* response)
+{
 	gchar* token = NULL;
 	gchar* token_secret = NULL;
 	gchar* username = NULL;
 	GHashTable* data = NULL;
-	const gchar* _tmp1_;
-	GHashTable* _tmp2_;
-	GHashTable* _tmp3_;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_;
-	GHashTable* _tmp6_;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_;
-	GHashTable* _tmp9_;
-	gconstpointer _tmp10_ = NULL;
-	gchar* _tmp11_;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
+	gconstpointer _tmp2_ = NULL;
+	gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gconstpointer _tmp5_ = NULL;
+	gchar* _tmp6_;
+	GHashTable* _tmp7_;
+	gconstpointer _tmp8_ = NULL;
+	gchar* _tmp9_;
+	const gchar* _tmp10_;
+	const gchar* _tmp11_;
 	const gchar* _tmp12_;
-	const gchar* _tmp13_;
-	const gchar* _tmp14_;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp17_;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp14_ = FALSE;
+	const gchar* _tmp15_;
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (response != NULL);
 #line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = response;
-#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:234: ACTION: extracting access phas" \
-"e credentials from '%s'", _tmp0_);
+"e credentials from '%s'", response);
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	token = NULL;
 #line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1455,114 +1515,112 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 #line 238 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	username = NULL;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = response;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
+	_tmp0_ = soup_form_decode (response);
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	data = _tmp2_;
+	data = _tmp0_;
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = data;
+	_tmp1_ = data;
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+	g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token);
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	token = _tmp5_;
+	token = _tmp3_;
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = data;
+	_tmp4_ = data;
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+	g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token_secret);
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp6_ = g_strdup (_tmp5_);
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	token_secret = _tmp8_;
+	token_secret = _tmp6_;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = data;
+	_tmp7_ = data;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
+	g_hash_table_lookup_extended (_tmp7_, "username", NULL, &_tmp8_);
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (username);
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = g_strdup (_tmp10_);
+	_tmp9_ = g_strdup (_tmp8_);
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	username = _tmp11_;
+	username = _tmp9_;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = token;
+	_tmp10_ = token;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp13_ = token_secret;
+	_tmp11_ = token_secret;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp14_ = username;
+	_tmp12_ = username;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:245: access phase credentials: { to" \
-"ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
+"ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp10_, _tmp11_, _tmp12_);
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp17_ = token;
+	_tmp15_ = token;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp17_ == NULL) {
+	if (_tmp15_ == NULL) {
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp16_ = TRUE;
-#line 1491 "FlickrPublishingAuthenticator.c"
+		_tmp14_ = TRUE;
+#line 1549 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp18_;
+		const gchar* _tmp16_;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp18_ = token_secret;
+		_tmp16_ = token_secret;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp16_ = _tmp18_ == NULL;
-#line 1498 "FlickrPublishingAuthenticator.c"
+		_tmp14_ = _tmp16_ == NULL;
+#line 1556 "FlickrPublishingAuthenticator.c"
 	}
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp16_) {
+	if (_tmp14_) {
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp15_ = TRUE;
-#line 1504 "FlickrPublishingAuthenticator.c"
+		_tmp13_ = TRUE;
+#line 1562 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp19_;
+		const gchar* _tmp17_;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp19_ = username;
+		_tmp17_ = username;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp15_ = _tmp19_ == NULL;
-#line 1511 "FlickrPublishingAuthenticator.c"
+		_tmp13_ = _tmp17_ == NULL;
+#line 1569 "FlickrPublishingAuthenticator.c"
 	}
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp15_) {
-#line 1515 "FlickrPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp20_;
-		GError* _tmp21_;
-		GError* _tmp22_;
+	if (_tmp13_) {
+#line 1573 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp18_;
+		GError* _tmp19_;
+		GError* _tmp20_;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
+		_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
 "but at " "least one of these is absent");
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp22_ = _tmp21_;
+		_tmp20_ = _tmp19_;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
+		spit_publishing_plugin_host_post_error (_tmp18_, _tmp20_);
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp22_);
+		_g_error_free0 (_tmp20_);
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1531 "FlickrPublishingAuthenticator.c"
+#line 1589 "FlickrPublishingAuthenticator.c"
 	} else {
-		PublishingRESTSupportOAuth1Session* _tmp23_;
+		PublishingRESTSupportOAuth1Session* _tmp21_;
+		const gchar* _tmp22_;
+		const gchar* _tmp23_;
 		const gchar* _tmp24_;
-		const gchar* _tmp25_;
-		const gchar* _tmp26_;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp24_ = token;
+		_tmp22_ = token;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp25_ = token_secret;
+		_tmp23_ = token_secret;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp26_ = username;
+		_tmp24_ = username;
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 1547 "FlickrPublishingAuthenticator.c"
+		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp21_, _tmp22_, _tmp23_, _tmp24_);
+#line 1605 "FlickrPublishingAuthenticator.c"
 	}
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (data);
@@ -1572,11 +1630,13 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 	_g_free0 (token_secret);
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token);
-#line 1557 "FlickrPublishingAuthenticator.c"
+#line 1615 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass)
+{
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_parent_class = g_type_class_peek_parent (klass);
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1587,15 +1647,19 @@ static void publishing_authenticator_shotwell_flickr_flickr_class_init (Publishi
 	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
-#line 1572 "FlickrPublishingAuthenticator.c"
+#line 1632 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) {
+static void
+publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) {
+GType
+publishing_authenticator_shotwell_flickr_flickr_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_flickr_flickr_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_flickr_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrFlickrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_flickr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrFlickr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_flickr_instance_init, NULL };
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 };
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.c b/plugins/authenticator/shotwell/OAuth1Authenticator.c
index 4fe57ef..7cf5780 100644
--- a/plugins/authenticator/shotwell/OAuth1Authenticator.c
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.c
@@ -1,4 +1,4 @@
-/* OAuth1Authenticator.c generated by valac 0.36.6, the Vala compiler
+/* OAuth1Authenticator.c generated by valac 0.40.4, the Vala compiler
  * generated from OAuth1Authenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -26,6 +27,11 @@
 typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
 typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
 typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_oauth1_authenticator_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_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 _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -52,12 +58,13 @@ static gpointer publishing_authenticator_shotwell_oauth1_authenticator_parent_cl
 static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = NULL;
 
 GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_DUMMY_PROPERTY
-};
 void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender,
+                                                                                                                                     gpointer self);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+                                                                                                                      const gchar* api_key,
+                                                                                                                      const gchar* api_secret,
+                                                                                                                      SpitPublishingPluginHost* host);
 static void _g_free0_ (gpointer var);
 static void _g_variant_unref0_ (gpointer var);
 static GVariant* _variant_new1 (const gchar* value);
@@ -72,9 +79,12 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (
 void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret);
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                               const gchar* token);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                                      const gchar* secret);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                                  const gchar* username);
 gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
@@ -85,68 +95,81 @@ static GVariant* _variant_new5 (gchar* value);
 static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj);
 
 
-static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender,
+                                                                                                                                gpointer self)
+{
 #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated ((PublishingAuthenticatorShotwellOAuth1Authenticator*) self);
-#line 92 "OAuth1Authenticator.c"
+#line 105 "OAuth1Authenticator.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 99 "OAuth1Authenticator.c"
+#line 114 "OAuth1Authenticator.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	var = (g_free (var), NULL);
-#line 106 "OAuth1Authenticator.c"
+#line 123 "OAuth1Authenticator.c"
 }
 
 
-static void _g_variant_unref0_ (gpointer var) {
+static void
+_g_variant_unref0_ (gpointer var)
+{
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 113 "OAuth1Authenticator.c"
+#line 132 "OAuth1Authenticator.c"
 }
 
 
-static GVariant* _variant_new1 (const gchar* value) {
+static GVariant*
+_variant_new1 (const gchar* value)
+{
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 120 "OAuth1Authenticator.c"
+#line 141 "OAuth1Authenticator.c"
 }
 
 
-static GVariant* _variant_new2 (const gchar* value) {
+static GVariant*
+_variant_new2 (const gchar* value)
+{
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 127 "OAuth1Authenticator.c"
+#line 150 "OAuth1Authenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellOAuth1Authenticator*
+publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+                                                                  const gchar* api_key,
+                                                                  const gchar* api_secret,
+                                                                  SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorShotwellOAuth1Authenticator * self = NULL;
 	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	GHashFunc _tmp2_;
-	GEqualFunc _tmp3_;
+	GHashFunc _tmp1_;
+	GEqualFunc _tmp2_;
+	GHashTable* _tmp3_;
 	GHashTable* _tmp4_;
-	GHashTable* _tmp5_;
-	gchar* _tmp6_;
-	const gchar* _tmp7_;
-	GVariant* _tmp8_;
-	GHashTable* _tmp9_;
-	gchar* _tmp10_;
-	const gchar* _tmp11_;
-	GVariant* _tmp12_;
-	PublishingRESTSupportOAuth1Session* _tmp13_;
-	PublishingRESTSupportOAuth1Session* _tmp14_;
-	const gchar* _tmp15_;
-	const gchar* _tmp16_;
-	PublishingRESTSupportOAuth1Session* _tmp17_;
+	gchar* _tmp5_;
+	GVariant* _tmp6_;
+	GHashTable* _tmp7_;
+	gchar* _tmp8_;
+	GVariant* _tmp9_;
+	PublishingRESTSupportOAuth1Session* _tmp10_;
+	PublishingRESTSupportOAuth1Session* _tmp11_;
+	PublishingRESTSupportOAuth1Session* _tmp12_;
 #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_val_if_fail (api_key != NULL, NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -156,112 +179,114 @@ PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_sho
 #line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	self = (PublishingAuthenticatorShotwellOAuth1Authenticator*) g_object_new (object_type, NULL);
 #line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp0_ = host;
-#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (host);
 #line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_g_object_unref0 (self->host);
 #line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	self->host = _tmp1_;
+	self->host = _tmp0_;
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp2_ = g_str_hash;
+	_tmp1_ = g_str_hash;
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp3_ = g_str_equal;
+	_tmp2_ = g_str_equal;
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.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 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_g_hash_table_unref0 (self->params);
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	self->params = _tmp4_;
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp5_ = self->params;
+	self->params = _tmp3_;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp6_ = g_strdup ("ConsumerKey");
+	_tmp4_ = self->params;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp7_ = api_key;
+	_tmp5_ = g_strdup ("ConsumerKey");
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp8_ = _variant_new1 (_tmp7_);
+	_tmp6_ = _variant_new1 (api_key);
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	g_hash_table_insert (_tmp5_, _tmp6_, _tmp8_);
+	g_hash_table_insert (_tmp4_, _tmp5_, _tmp6_);
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp9_ = self->params;
+	_tmp7_ = self->params;
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp10_ = g_strdup ("ConsumerSecret");
+	_tmp8_ = g_strdup ("ConsumerSecret");
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp11_ = api_secret;
+	_tmp9_ = _variant_new2 (api_secret);
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp12_ = _variant_new2 (_tmp11_);
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	g_hash_table_insert (_tmp9_, _tmp10_, _tmp12_);
+	g_hash_table_insert (_tmp7_, _tmp8_, _tmp9_);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp13_ = publishing_rest_support_oauth1_session_new (NULL);
+	_tmp10_ = publishing_rest_support_oauth1_session_new (NULL);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_publishing_rest_support_session_unref0 (self->session);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	self->session = _tmp13_;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp14_ = self->session;
+	self->session = _tmp10_;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp15_ = api_key;
+	_tmp11_ = self->session;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp16_ = api_secret;
-#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	publishing_rest_support_oauth1_session_set_api_credentials (_tmp14_, _tmp15_, _tmp16_);
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp11_, api_key, api_secret);
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp17_ = self->session;
+	_tmp12_ = self->session;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
 #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return self;
-#line 217 "OAuth1Authenticator.c"
+#line 230 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_authenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return;
-#line 226 "OAuth1Authenticator.c"
+#line 241 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->authenticate (self);
-#line 235 "OAuth1Authenticator.c"
+#line 252 "OAuth1Authenticator.c"
 }
 
 
-static gboolean publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	gboolean _tmp0_ = FALSE;
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_can_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return _tmp0_;
-#line 245 "OAuth1Authenticator.c"
+#line 264 "OAuth1Authenticator.c"
 }
 
 
-gboolean publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), FALSE);
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->can_logout (self);
-#line 254 "OAuth1Authenticator.c"
+#line 275 "OAuth1Authenticator.c"
 }
 
 
-static gpointer _g_hash_table_ref0 (gpointer self) {
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 261 "OAuth1Authenticator.c"
+#line 284 "OAuth1Authenticator.c"
 }
 
 
-static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+static GHashTable*
+publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base)
+{
 	PublishingAuthenticatorShotwellOAuth1Authenticator * self;
 	GHashTable* result = NULL;
 	GHashTable* _tmp0_;
@@ -276,47 +301,57 @@ static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_g
 	result = _tmp1_;
 #line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return result;
-#line 280 "OAuth1Authenticator.c"
+#line 305 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return;
-#line 289 "OAuth1Authenticator.c"
+#line 316 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->logout (self);
-#line 298 "OAuth1Authenticator.c"
+#line 327 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_refresh'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return;
-#line 307 "OAuth1Authenticator.c"
+#line 338 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->refresh (self);
-#line 316 "OAuth1Authenticator.c"
+#line 349 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -325,11 +360,13 @@ void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persisten
 	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (self, "");
 #line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (self, "");
-#line 329 "OAuth1Authenticator.c"
+#line 364 "OAuth1Authenticator.c"
 }
 
 
-gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gboolean
+publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
@@ -348,7 +385,7 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
 	_g_free0 (_tmp3_);
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	if (_tmp4_) {
-#line 352 "OAuth1Authenticator.c"
+#line 389 "OAuth1Authenticator.c"
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -359,15 +396,15 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
 		_tmp1_ = _tmp6_ != NULL;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 		_g_free0 (_tmp6_);
-#line 363 "OAuth1Authenticator.c"
+#line 400 "OAuth1Authenticator.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 		_tmp1_ = FALSE;
-#line 367 "OAuth1Authenticator.c"
+#line 404 "OAuth1Authenticator.c"
 	}
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	if (_tmp1_) {
-#line 371 "OAuth1Authenticator.c"
+#line 408 "OAuth1Authenticator.c"
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -378,21 +415,23 @@ gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_se
 		_tmp0_ = _tmp8_ != NULL;
 #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 		_g_free0 (_tmp8_);
-#line 382 "OAuth1Authenticator.c"
+#line 419 "OAuth1Authenticator.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 		_tmp0_ = FALSE;
-#line 386 "OAuth1Authenticator.c"
+#line 423 "OAuth1Authenticator.c"
 	}
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return result;
-#line 392 "OAuth1Authenticator.c"
+#line 429 "OAuth1Authenticator.c"
 }
 
 
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -406,13 +445,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
 	result = _tmp1_;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return result;
-#line 410 "OAuth1Authenticator.c"
+#line 449 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                             const gchar* username)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -420,14 +461,14 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
 #line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_tmp0_ = self->host;
 #line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp1_ = username;
-#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 427 "OAuth1Authenticator.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", username);
+#line 466 "OAuth1Authenticator.c"
 }
 
 
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -441,13 +482,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return result;
-#line 445 "OAuth1Authenticator.c"
+#line 486 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                          const gchar* token)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -455,14 +498,14 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_tmp0_ = self->host;
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp1_ = token;
-#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 462 "OAuth1Authenticator.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", token);
+#line 503 "OAuth1Authenticator.c"
 }
 
 
-gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+gchar*
+publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -476,13 +519,15 @@ gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_acc
 	result = _tmp1_;
 #line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return result;
-#line 480 "OAuth1Authenticator.c"
+#line 523 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self,
+                                                                                                 const gchar* secret)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
 #line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -490,35 +535,41 @@ void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_acces
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	_tmp0_ = self->host;
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	_tmp1_ = secret;
-#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 497 "OAuth1Authenticator.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", secret);
+#line 540 "OAuth1Authenticator.c"
 }
 
 
-static GVariant* _variant_new3 (gchar* value) {
+static GVariant*
+_variant_new3 (gchar* value)
+{
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 504 "OAuth1Authenticator.c"
+#line 549 "OAuth1Authenticator.c"
 }
 
 
-static GVariant* _variant_new4 (gchar* value) {
+static GVariant*
+_variant_new4 (gchar* value)
+{
 #line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 511 "OAuth1Authenticator.c"
+#line 558 "OAuth1Authenticator.c"
 }
 
 
-static GVariant* _variant_new5 (gchar* value) {
+static GVariant*
+_variant_new5 (gchar* value)
+{
 #line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 518 "OAuth1Authenticator.c"
+#line 567 "OAuth1Authenticator.c"
 }
 
 
-void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+void
+publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self)
+{
 	GHashTable* _tmp0_;
 	gchar* _tmp1_;
 	PublishingRESTSupportOAuth1Session* _tmp2_;
@@ -628,11 +679,13 @@ void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authentic
 	_g_free0 (_tmp26_);
 #line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
-#line 632 "OAuth1Authenticator.c"
+#line 683 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_class_init (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass * klass) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_class_init (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -645,11 +698,13 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_class_init (P
 	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_refresh;
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_oauth1_authenticator_finalize;
-#line 649 "OAuth1Authenticator.c"
+#line 702 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
@@ -662,15 +717,19 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_spit_publishi
 	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_logout;
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_refresh;
-#line 666 "OAuth1Authenticator.c"
+#line 721 "OAuth1Authenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_instance_init (PublishingAuthenticatorShotwellOAuth1Authenticator * self) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_instance_init (PublishingAuthenticatorShotwellOAuth1Authenticator * self)
+{
 }
 
 
-static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellOAuth1Authenticator * self;
 	PublishingRESTSupportOAuth1Session* _tmp0_;
 	guint _tmp1_;
@@ -690,11 +749,13 @@ static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GOb
 	_g_object_unref0 (self->host);
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_oauth1_authenticator_parent_class)->finalize (obj);
-#line 694 "OAuth1Authenticator.c"
+#line 753 "OAuth1Authenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) {
+GType
+publishing_authenticator_shotwell_oauth1_authenticator_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellOAuth1Authenticator), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index 6ac8485..a9568e0 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -1,7 +1,8 @@
-/* ShotwellAuthenticatorFactory.c generated by valac 0.36.6, the Vala compiler
+/* ShotwellAuthenticatorFactory.c generated by valac 0.40.4, the Vala compiler
  * generated from ShotwellAuthenticatorFactory.vala, do not modify */
 
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -21,6 +22,11 @@
 typedef struct _PublishingAuthenticatorFactory PublishingAuthenticatorFactory;
 typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFactoryClass;
 typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_FACTORY_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_factory_properties[PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
@@ -89,38 +95,49 @@ static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance
 static SpitPublishingAuthenticatorFactoryIface * publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
 
 GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_FACTORY_DUMMY_PROPERTY
-};
 PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void);
 PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void);
 PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type);
 static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base);
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host);
+static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+                                                                           const gchar* provider,
+                                                                           SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+                                                                                                                SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
-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);
 GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
 PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
 static void publishing_authenticator_factory_finalize (GObject * obj);
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 120 "ShotwellAuthenticatorFactory.c"
+#line 135 "ShotwellAuthenticatorFactory.c"
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_get_instance (void)
+{
 	PublishingAuthenticatorFactory* result = NULL;
 	PublishingAuthenticatorFactory* _tmp0_;
 	PublishingAuthenticatorFactory* _tmp2_;
@@ -129,7 +146,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	_tmp0_ = publishing_authenticator_factory_instance;
 #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	if (_tmp0_ == NULL) {
-#line 133 "ShotwellAuthenticatorFactory.c"
+#line 150 "ShotwellAuthenticatorFactory.c"
 		PublishingAuthenticatorFactory* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		_tmp1_ = publishing_authenticator_factory_new ();
@@ -137,7 +154,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 		_g_object_unref0 (publishing_authenticator_factory_instance);
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		publishing_authenticator_factory_instance = _tmp1_;
-#line 141 "ShotwellAuthenticatorFactory.c"
+#line 158 "ShotwellAuthenticatorFactory.c"
 	}
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp2_ = publishing_authenticator_factory_instance;
@@ -147,11 +164,13 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	result = _tmp3_;
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 151 "ShotwellAuthenticatorFactory.c"
+#line 168 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base) {
+static GeeList*
+publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base)
+{
 	PublishingAuthenticatorFactory * self;
 	GeeList* result = NULL;
 	GeeArrayList* list = NULL;
@@ -176,26 +195,29 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 180 "ShotwellAuthenticatorFactory.c"
+#line 199 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) {
+static SpitPublishingAuthenticator*
+publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+                                              const gchar* provider,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorFactory * self;
 	SpitPublishingAuthenticator* result = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	GQuark _tmp3_ = 0U;
+	GQuark _tmp2_ = 0U;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label0 = 0;
+	static GQuark _tmp1_label0 = 0;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label1 = 0;
+	static GQuark _tmp1_label1 = 0;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label2 = 0;
+	static GQuark _tmp1_label2 = 0;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label3 = 0;
+	static GQuark _tmp1_label3 = 0;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label4 = 0;
+	static GQuark _tmp1_label4 = 0;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -205,182 +227,179 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp0_ = provider;
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	_tmp1_ = _tmp0_;
-#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
+	_tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_);
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("flickr")))) {
+	if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("flickr")))) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 216 "ShotwellAuthenticatorFactory.c"
+#line 236 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp4_;
-				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_;
+				PublishingAuthenticatorShotwellFlickrFlickr* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp4_ = host;
+				_tmp3_ = publishing_authenticator_shotwell_flickr_flickr_new (host);
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_new (_tmp4_);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 229 "ShotwellAuthenticatorFactory.c"
+#line 246 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("facebook")))) {
+	} else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("facebook")))) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 235 "ShotwellAuthenticatorFactory.c"
+#line 252 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp6_;
-				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_;
+				PublishingAuthenticatorShotwellFacebookFacebook* _tmp4_;
 #line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp6_ = host;
+				_tmp4_ = publishing_authenticator_shotwell_facebook_facebook_new (host);
 #line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp7_ = publishing_authenticator_shotwell_facebook_facebook_new (_tmp6_);
-#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 248 "ShotwellAuthenticatorFactory.c"
+#line 262 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("picasa")))) {
+	} else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("picasa")))) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 254 "ShotwellAuthenticatorFactory.c"
+#line 268 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp8_;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_;
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp8_ = host;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp5_;
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp9_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
+				_tmp5_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
 "\n" \
 "Click Log in to log into Picasa Web Albums in your Web browser. You wi" \
 "ll have to authorize Shotwell Connect to link to your Picasa Web Album" \
-"s account."), _tmp8_);
+"s account."), host);
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 267 "ShotwellAuthenticatorFactory.c"
+#line 278 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) {
+	} else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("youtube")))) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 273 "ShotwellAuthenticatorFactory.c"
+#line 284 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp10_;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_;
-#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp10_ = host;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp6_;
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp11_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
+				_tmp6_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
 "\n" \
 "You must have already signed up for a Google account and set it up for" \
 " use with YouTube to continue. You can set up most accounts by using y" \
-"our browser to log into the YouTube site at least once."), _tmp10_);
+"our browser to log into the YouTube site at least once."), host);
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 286 "ShotwellAuthenticatorFactory.c"
+#line 294 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("tumblr")))) {
+	} else if (_tmp2_ == ((0 != _tmp1_label4) ? _tmp1_label4 : (_tmp1_label4 = g_quark_from_static_string ("tumblr")))) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 292 "ShotwellAuthenticatorFactory.c"
+#line 300 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp12_;
-				PublishingAuthenticatorShotwellTumblrTumblr* _tmp13_;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp12_ = host;
+				PublishingAuthenticatorShotwellTumblrTumblr* _tmp7_;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp13_ = publishing_authenticator_shotwell_tumblr_tumblr_new (_tmp12_);
+				_tmp7_ = publishing_authenticator_shotwell_tumblr_tumblr_new (host);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 305 "ShotwellAuthenticatorFactory.c"
+#line 310 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 311 "ShotwellAuthenticatorFactory.c"
+#line 316 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = NULL;
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 318 "ShotwellAuthenticatorFactory.c"
+#line 323 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	}
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_construct (GType object_type)
+{
 	PublishingAuthenticatorFactory * self = NULL;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self;
-#line 331 "ShotwellAuthenticatorFactory.c"
+#line 338 "ShotwellAuthenticatorFactory.c"
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_new (void)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return publishing_authenticator_factory_construct (PUBLISHING_AUTHENTICATOR_TYPE_FACTORY);
-#line 338 "ShotwellAuthenticatorFactory.c"
+#line 347 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass) {
+static void
+publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	publishing_authenticator_factory_parent_class = g_type_class_peek_parent (klass);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_factory_finalize;
-#line 347 "ShotwellAuthenticatorFactory.c"
+#line 358 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+static void
+publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = g_type_interface_peek_parent (iface);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	iface->get_available_authenticators = (GeeList* (*) (SpitPublishingAuthenticatorFactory *)) publishing_authenticator_factory_real_get_available_authenticators;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create;
-#line 358 "ShotwellAuthenticatorFactory.c"
+#line 371 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self) {
+static void
+publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self)
+{
 }
 
 
-static void publishing_authenticator_factory_finalize (GObject * obj) {
+static void
+publishing_authenticator_factory_finalize (GObject * obj)
+{
 	PublishingAuthenticatorFactory * self;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (publishing_authenticator_factory_parent_class)->finalize (obj);
-#line 372 "ShotwellAuthenticatorFactory.c"
+#line 389 "ShotwellAuthenticatorFactory.c"
 }
 
 
-GType publishing_authenticator_factory_get_type (void) {
+GType
+publishing_authenticator_factory_get_type (void)
+{
 	static volatile gsize publishing_authenticator_factory_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_factory_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorFactoryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_factory_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorFactory), 0, (GInstanceInitFunc) publishing_authenticator_factory_instance_init, NULL };
diff --git a/plugins/authenticator/shotwell/TumblrAuthenticator.c b/plugins/authenticator/shotwell/TumblrAuthenticator.c
index 1ebc0f4..5fd814c 100644
--- a/plugins/authenticator/shotwell/TumblrAuthenticator.c
+++ b/plugins/authenticator/shotwell/TumblrAuthenticator.c
@@ -1,4 +1,4 @@
-/* TumblrAuthenticator.c generated by valac 0.36.6, the Vala compiler
+/* TumblrAuthenticator.c generated by valac 0.40.4, the Vala compiler
  * generated from TumblrAuthenticator.vala, do not modify */
 
 /* Copyright 2012 BJA Electronics
@@ -10,6 +10,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -31,6 +32,11 @@
 typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPane PublishingAuthenticatorShotwellTumblrAuthenticationPane;
 typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass;
 typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_tumblr_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_PROPERTIES];
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_TYPE_MODE (publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -38,9 +44,9 @@ typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate P
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL,
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction))
@@ -74,6 +80,11 @@ typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate Publis
 typedef struct _PublishingAuthenticatorShotwellTumblrTumblr PublishingAuthenticatorShotwellTumblrTumblr;
 typedef struct _PublishingAuthenticatorShotwellTumblrTumblrClass PublishingAuthenticatorShotwellTumblrTumblrClass;
 typedef struct _PublishingAuthenticatorShotwellTumblrTumblrPrivate PublishingAuthenticatorShotwellTumblrTumblrPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_shotwell_tumblr_tumblr_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_NUM_PROPERTIES];
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
@@ -149,60 +160,86 @@ static gpointer publishing_authenticator_shotwell_tumblr_tumblr_parent_class = N
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
 GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) G_GNUC_CONST;
 PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type,
+                                                                                                                                 PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                         gpointer self);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                             gpointer self);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                               gpointer self);
 GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
 static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
 static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj);
 GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                                                                               const gchar* username,
+                                                                                                                                               const gchar* password);
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type,
+                                                                                                                                                     PublishingRESTSupportOAuth1Session* session,
+                                                                                                                                                     const gchar* username,
+                                                                                                                                                     const gchar* password);
 GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_DUMMY_PROPERTY
-};
 PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type,
+                                                                                                                      const gchar* api_key,
+                                                                                                                      const gchar* api_secret,
+                                                                                                                      SpitPublishingPluginHost* host);
 static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
 gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                  PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
 static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
 static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
 void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response);
-
-
-GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) {
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                           const gchar* username,
+                                                                                           const gchar* password);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender,
+                                                                                                                                                               const gchar* user,
+                                                                                                                                                               const gchar* password,
+                                                                                                                                                               gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                       const gchar* username,
+                                                                       const gchar* password);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                PublishingRESTSupportTransaction* txn,
+                                                                                GError* err);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                                   GError* err,
+                                                                                                                                   gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                            const gchar* response);
+
+
+GType
+publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -214,35 +251,49 @@ GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 221 "TumblrAuthenticator.c"
+#line 260 "TumblrAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                    gpointer self)
+{
 #line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 228 "TumblrAuthenticator.c"
+#line 270 "TumblrAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                        gpointer self)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 235 "TumblrAuthenticator.c"
+#line 280 "TumblrAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                          gpointer self)
+{
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
-#line 242 "TumblrAuthenticator.c"
+#line 290 "TumblrAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+PublishingAuthenticatorShotwellTumblrAuthenticationPane*
+publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type,
+                                                                        PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self = NULL;
 	GtkBox* _tmp0_;
 	GError * _inner_error_ = NULL;
@@ -256,7 +307,7 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
 	_g_object_unref0 (self->priv->pane_widget);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 260 "TumblrAuthenticator.c"
+#line 311 "TumblrAuthenticator.c"
 	{
 		GtkBuilder* _tmp1_;
 		GtkBuilder* _tmp2_;
@@ -269,25 +320,24 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
 		GtkBuilder* _tmp7_;
 		GObject* _tmp8_;
 		GtkLabel* _tmp9_;
-		PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp10_;
-		GtkBuilder* _tmp17_;
-		GObject* _tmp18_;
-		GtkEntry* _tmp19_;
-		GtkBuilder* _tmp20_;
-		GObject* _tmp21_;
-		GtkEntry* _tmp22_;
-		GtkBuilder* _tmp23_;
-		GObject* _tmp24_;
-		GtkButton* _tmp25_;
+		GtkBuilder* _tmp16_;
+		GObject* _tmp17_;
+		GtkEntry* _tmp18_;
+		GtkBuilder* _tmp19_;
+		GObject* _tmp20_;
+		GtkEntry* _tmp21_;
+		GtkBuilder* _tmp22_;
+		GObject* _tmp23_;
+		GtkButton* _tmp24_;
+		GtkEntry* _tmp25_;
 		GtkEntry* _tmp26_;
-		GtkEntry* _tmp27_;
-		GtkButton* _tmp28_;
-		GtkWidget* _tmp29_;
+		GtkButton* _tmp27_;
+		GtkWidget* _tmp28_;
+		GtkContainer* _tmp29_;
 		GtkContainer* _tmp30_;
-		GtkContainer* _tmp31_;
-		GtkWidget* _tmp32_;
-		GtkBox* _tmp33_;
-		GtkWidget* _tmp34_;
+		GtkWidget* _tmp31_;
+		GtkBox* _tmp32_;
+		GtkWidget* _tmp33_;
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_tmp1_ = gtk_builder_new ();
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -300,7 +350,7 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
 #line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 304 "TumblrAuthenticator.c"
+#line 354 "TumblrAuthenticator.c"
 			goto __catch8_g_error;
 		}
 #line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -324,137 +374,135 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
 #line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		message_label = _tmp9_;
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp10_ = mode;
-#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		switch (_tmp10_) {
+		switch (mode) {
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 			case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO:
-#line 333 "TumblrAuthenticator.c"
+#line 381 "TumblrAuthenticator.c"
 			{
-				GtkLabel* _tmp11_;
-				const gchar* _tmp12_;
+				GtkLabel* _tmp10_;
+				const gchar* _tmp11_;
 #line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp11_ = message_label;
+				_tmp10_ = message_label;
 #line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp12_ = publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
+				_tmp11_ = publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
 #line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				gtk_label_set_text (_tmp11_, _tmp12_);
+				gtk_label_set_text (_tmp10_, _tmp11_);
 #line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 				break;
-#line 345 "TumblrAuthenticator.c"
+#line 393 "TumblrAuthenticator.c"
 			}
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 			case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 349 "TumblrAuthenticator.c"
+#line 397 "TumblrAuthenticator.c"
 			{
-				GtkLabel* _tmp13_;
-				const gchar* _tmp14_;
+				GtkLabel* _tmp12_;
+				const gchar* _tmp13_;
+				gchar* _tmp14_;
 				gchar* _tmp15_;
-				gchar* _tmp16_;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp13_ = message_label;
+				_tmp12_ = message_label;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp14_ = publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+				_tmp13_ = publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
+				_tmp14_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp13_);
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_tmp16_ = _tmp15_;
+				_tmp15_ = _tmp14_;
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				gtk_label_set_markup (_tmp13_, _tmp16_);
+				gtk_label_set_markup (_tmp12_, _tmp15_);
 #line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-				_g_free0 (_tmp16_);
+				_g_free0 (_tmp15_);
 #line 54 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 				break;
-#line 369 "TumblrAuthenticator.c"
+#line 417 "TumblrAuthenticator.c"
 			}
 			default:
 #line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 			break;
-#line 374 "TumblrAuthenticator.c"
+#line 422 "TumblrAuthenticator.c"
 		}
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp17_ = self->priv->builder;
+		_tmp16_ = self->priv->builder;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
+		_tmp17_ = gtk_builder_get_object (_tmp16_, "username_entry");
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp17_) : NULL);
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_object_unref0 (self->priv->username_entry);
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		self->priv->username_entry = _tmp19_;
+		self->priv->username_entry = _tmp18_;
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp20_ = self->priv->builder;
+		_tmp19_ = self->priv->builder;
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
+		_tmp20_ = gtk_builder_get_object (_tmp19_, "password_entry");
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
+		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp20_) : NULL);
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_object_unref0 (self->priv->password_entry);
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		self->priv->password_entry = _tmp22_;
+		self->priv->password_entry = _tmp21_;
 #line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp23_ = self->priv->builder;
+		_tmp22_ = self->priv->builder;
 #line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
+		_tmp23_ = gtk_builder_get_object (_tmp22_, "login_button");
 #line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
+		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
 #line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_object_unref0 (self->priv->login_button);
 #line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		self->priv->login_button = _tmp25_;
+		self->priv->login_button = _tmp24_;
 #line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp26_ = self->priv->username_entry;
+		_tmp25_ = self->priv->username_entry;
 #line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp27_ = self->priv->password_entry;
+		_tmp26_ = self->priv->password_entry;
 #line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp28_ = self->priv->login_button;
+		_tmp27_ = self->priv->login_button;
 #line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp27_, "clicked", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp29_ = content;
+		_tmp28_ = content;
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp30_ = gtk_widget_get_parent (_tmp29_);
+		_tmp29_ = gtk_widget_get_parent (_tmp28_);
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp31_ = _tmp30_;
+		_tmp30_ = _tmp29_;
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp32_ = content;
+		_tmp31_ = content;
 #line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		gtk_container_remove (_tmp31_, _tmp32_);
+		gtk_container_remove (_tmp30_, _tmp31_);
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp33_ = self->priv->pane_widget;
+		_tmp32_ = self->priv->pane_widget;
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp34_ = content;
+		_tmp33_ = content;
 #line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), _tmp33_);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_object_unref0 (message_label);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_object_unref0 (content);
-#line 438 "TumblrAuthenticator.c"
+#line 486 "TumblrAuthenticator.c"
 	}
 	goto __finally8;
 	__catch8_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp35_;
-		const gchar* _tmp36_;
+		GError* _tmp34_;
+		const gchar* _tmp35_;
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		e = _inner_error_;
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp35_ = e;
+		_tmp34_ = e;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp36_ = _tmp35_->message;
+		_tmp35_ = _tmp34_->message;
 #line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		g_warning (_ ("Could not load UI: %s"), _tmp36_);
+		g_warning (_ ("Could not load UI: %s"), _tmp35_);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_error_free0 (e);
-#line 458 "TumblrAuthenticator.c"
+#line 506 "TumblrAuthenticator.c"
 	}
 	__finally8:
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -465,22 +513,26 @@ PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticato
 		g_clear_error (&_inner_error_);
 #line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		return NULL;
-#line 469 "TumblrAuthenticator.c"
+#line 517 "TumblrAuthenticator.c"
 	}
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return self;
-#line 473 "TumblrAuthenticator.c"
+#line 521 "TumblrAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+PublishingAuthenticatorShotwellTumblrAuthenticationPane*
+publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return publishing_authenticator_shotwell_tumblr_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, mode);
-#line 480 "TumblrAuthenticator.c"
+#line 530 "TumblrAuthenticator.c"
 }
 
 
-GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+GtkWidget*
+publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_;
 	GtkWidget* _tmp1_;
@@ -494,11 +546,13 @@ GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_defa
 	result = _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return result;
-#line 498 "TumblrAuthenticator.c"
+#line 550 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
 	GtkEntry* _tmp2_;
@@ -515,29 +569,35 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_logi
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
 #line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_signal_emit (self, publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
-#line 519 "TumblrAuthenticator.c"
+#line 573 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
 #line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
 #line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 528 "TumblrAuthenticator.c"
+#line 584 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
 #line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
 #line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 537 "TumblrAuthenticator.c"
+#line 595 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self)
+{
 	gboolean _tmp0_ = FALSE;
 	GtkEntry* _tmp1_;
 	guint _tmp2_;
@@ -553,7 +613,7 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_
 	_tmp3_ = _tmp2_;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 557 "TumblrAuthenticator.c"
+#line 617 "TumblrAuthenticator.c"
 		GtkEntry* _tmp4_;
 		guint _tmp5_;
 		guint _tmp6_;
@@ -565,21 +625,23 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_
 		_tmp6_ = _tmp5_;
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 569 "TumblrAuthenticator.c"
+#line 629 "TumblrAuthenticator.c"
 	} else {
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_tmp0_ = FALSE;
-#line 573 "TumblrAuthenticator.c"
+#line 633 "TumblrAuthenticator.c"
 	}
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_tmp7_ = self->priv->login_button;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 579 "TumblrAuthenticator.c"
+#line 639 "TumblrAuthenticator.c"
 }
 
 
-static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -594,11 +656,13 @@ static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_r
 	result = _tmp1_;
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return result;
-#line 598 "TumblrAuthenticator.c"
+#line 660 "TumblrAuthenticator.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -607,11 +671,13 @@ static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return result;
-#line 611 "TumblrAuthenticator.c"
+#line 675 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
 	GtkEntry* _tmp0_;
 	GtkEntry* _tmp1_;
@@ -632,19 +698,28 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
-#line 636 "TumblrAuthenticator.c"
+#line 702 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
-#line 644 "TumblrAuthenticator.c"
+#line 712 "TumblrAuthenticator.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2);
 	register GMarshalFunc_VOID__STRING_STRING callback;
 	register GCClosure * cc;
@@ -659,23 +734,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa
 		data1 = closure->data;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 663 "TumblrAuthenticator.c"
+#line 738 "TumblrAuthenticator.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		data2 = closure->data;
-#line 669 "TumblrAuthenticator.c"
+#line 744 "TumblrAuthenticator.c"
 	}
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 675 "TumblrAuthenticator.c"
+#line 750 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_class_init (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_class_init (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -694,11 +771,13 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_class_i
 	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 698 "TumblrAuthenticator.c"
+#line 775 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -709,20 +788,24 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_spit_pu
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled;
-#line 713 "TumblrAuthenticator.c"
+#line 792 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init (PublishingAuthenticatorShotwellTumblrAuthenticationPane * self) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init (PublishingAuthenticatorShotwellTumblrAuthenticationPane * self)
+{
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self->priv->pane_widget = NULL;
-#line 722 "TumblrAuthenticator.c"
+#line 803 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj)
+{
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
@@ -738,7 +821,7 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_finaliz
 	_g_object_unref0 (self->priv->login_button);
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_tumblr_authentication_pane_parent_class)->finalize (obj);
-#line 742 "TumblrAuthenticator.c"
+#line 825 "TumblrAuthenticator.c"
 }
 
 
@@ -746,7 +829,9 @@ static void publishing_authenticator_shotwell_tumblr_authentication_pane_finaliz
      * The authentication pane used when asking service URL, user name and password
      * from the user.
      */
-GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init, NULL };
@@ -760,13 +845,15 @@ GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (voi
 }
 
 
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type,
+                                                                                   PublishingRESTSupportOAuth1Session* session,
+                                                                                   const gchar* username,
+                                                                                   const gchar* password)
+{
 	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* self = NULL;
-	PublishingRESTSupportOAuth1Session* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
 #line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -774,50 +861,54 @@ PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_aut
 #line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_val_if_fail (password != NULL, NULL);
 #line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = session;
-#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp1_ = username;
+	self = (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA);
+	_tmp0_ = soup_uri_encode (username, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA);
 #line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp1_);
 #line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp1_);
 #line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp4_ = password;
-#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", password);
 #line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
 #line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return self;
-#line 799 "TumblrAuthenticator.c"
+#line 880 "TumblrAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                             const gchar* username,
+                                                                             const gchar* password)
+{
 #line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 806 "TumblrAuthenticator.c"
+#line 891 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass * klass)
+{
 #line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 813 "TumblrAuthenticator.c"
+#line 900 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction * self) {
+static void
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init, NULL };
@@ -829,75 +920,78 @@ GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_ge
 }
 
 
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellTumblrTumblr*
+publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+                                                           SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorShotwellTumblrTumblr * self = NULL;
-	SpitPublishingPluginHost* _tmp0_;
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = host;
-#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellTumblrTumblr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET, _tmp0_);
+	self = (PublishingAuthenticatorShotwellTumblrTumblr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET, host);
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return self;
-#line 844 "TumblrAuthenticator.c"
+#line 935 "TumblrAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host) {
+PublishingAuthenticatorShotwellTumblrTumblr*
+publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host)
+{
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return publishing_authenticator_shotwell_tumblr_tumblr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, host);
-#line 851 "TumblrAuthenticator.c"
+#line 944 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellTumblrTumblr * self;
-	gboolean _tmp0_;
 #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
 #line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	if (_tmp0_) {
-#line 864 "TumblrAuthenticator.c"
-		PublishingRESTSupportOAuth1Session* _tmp1_;
+	if (publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))) {
+#line 956 "TumblrAuthenticator.c"
+		PublishingRESTSupportOAuth1Session* _tmp0_;
+		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
-		gchar* _tmp5_;
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		g_debug ("TumblrAuthenticator.vala:135: attempt start: a persistent session is a" \
 "vailable; using it");
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+		_tmp1_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+		_tmp3_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, "");
+		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp0_, _tmp2_, _tmp4_, "");
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp4_);
 #line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_g_free0 (_tmp3_);
-#line 888 "TumblrAuthenticator.c"
+		_g_free0 (_tmp2_);
+#line 980 "TumblrAuthenticator.c"
 	} else {
 #line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		g_debug ("TumblrAuthenticator.vala:140: attempt start: no persistent session ava" \
 "ilable; showing login welcome pane");
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO);
-#line 894 "TumblrAuthenticator.c"
+#line 986 "TumblrAuthenticator.c"
 	}
 }
 
 
-static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static gboolean
+publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellTumblrTumblr * self;
 	gboolean result = FALSE;
 #line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -906,11 +1000,13 @@ static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout
 	result = TRUE;
 #line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	return result;
-#line 908 "TumblrAuthenticator.c"
+#line 1002 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellTumblrTumblr * self;
 	PublishingRESTSupportOAuth1Session* _tmp0_;
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -921,15 +1017,17 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (Publish
 	publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
 #line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
-#line 923 "TumblrAuthenticator.c"
+#line 1019 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base)
+{
 	PublishingAuthenticatorShotwellTumblrTumblr * self;
 #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
-#line 931 "TumblrAuthenticator.c"
+#line 1029 "TumblrAuthenticator.c"
 }
 
 
@@ -944,22 +1042,29 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (Publis
          *
          * @param mode the mode for the authentication pane
          */
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender,
+                                                                                                                                                          const gchar* user,
+                                                                                                                                                          const gchar* password,
+                                                                                                                                                          gpointer self)
+{
 #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked ((PublishingAuthenticatorShotwellTumblrTumblr*) self, user, password);
-#line 949 "TumblrAuthenticator.c"
+#line 1052 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                             PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellTumblrAuthenticationPane* authentication_pane = NULL;
-	PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp1_;
-	PublishingAuthenticatorShotwellTumblrAuthenticationPane* _tmp2_;
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	SpitPublishingPluginHost* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp4_;
 	GtkWidget* _tmp5_;
-	GtkWidget* _tmp6_;
 #line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -969,30 +1074,28 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authenticati
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
 #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp1_ = mode;
+	_tmp1_ = publishing_authenticator_shotwell_tumblr_authentication_pane_new (mode);
 #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp2_ = publishing_authenticator_shotwell_tumblr_authentication_pane_new (_tmp1_);
-#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	authentication_pane = _tmp2_;
+	authentication_pane = _tmp1_;
 #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login, self, 0);
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp5_ = publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (authentication_pane);
+	_tmp4_ = publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (authentication_pane);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_g_object_unref0 (authentication_pane);
-#line 994 "TumblrAuthenticator.c"
+#line 1097 "TumblrAuthenticator.c"
 }
 
 
@@ -1006,9 +1109,11 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authenticati
          * @param username the name of the Tumblr user as entered in the dialog
          * @param password the password of the Tumblr as entered in the dialog
          */
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                      const gchar* username,
+                                                                                      const gchar* password)
+{
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1019,12 +1124,8 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pa
 	g_debug ("TumblrAuthenticator.vala:191: EVENT: on_authentication_pane_login_clic" \
 "ked");
 #line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = username;
-#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp1_ = password;
-#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (self, _tmp0_, _tmp1_);
-#line 1025 "TumblrAuthenticator.c"
+	publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (self, username, password);
+#line 1126 "TumblrAuthenticator.c"
 }
 
 
@@ -1036,28 +1137,37 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pa
          * @param username the name of the Tumblr user used to login
          * @param password the password of the Tumblr user used to login
          */
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                              gpointer self)
+{
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender);
-#line 1040 "TumblrAuthenticator.c"
+#line 1144 "TumblrAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                              GError* err,
+                                                                                                                              gpointer self)
+{
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender, err);
-#line 1047 "TumblrAuthenticator.c"
+#line 1155 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                  const gchar* username,
+                                                                  const gchar* password)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* txn = NULL;
 	PublishingRESTSupportOAuth1Session* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* _tmp5_;
+	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
@@ -1078,18 +1188,14 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp3_ = username;
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp4_ = password;
+	_tmp3_ = publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (_tmp2_, username, password);
 #line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp5_ = publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (_tmp2_, _tmp3_, _tmp4_);
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	txn = _tmp5_;
+	txn = _tmp3_;
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1090 "TumblrAuthenticator.c"
+#line 1196 "TumblrAuthenticator.c"
 	{
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1097,7 +1203,7 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1098 "TumblrAuthenticator.c"
+#line 1204 "TumblrAuthenticator.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1108,28 +1214,28 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
 			g_clear_error (&_inner_error_);
 #line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 			return;
-#line 1109 "TumblrAuthenticator.c"
+#line 1215 "TumblrAuthenticator.c"
 		}
 	}
 	goto __finally9;
 	__catch9_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_;
-		GError* _tmp7_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		err = _inner_error_;
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp7_ = err;
+		_tmp5_ = err;
 #line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1130 "TumblrAuthenticator.c"
+#line 1236 "TumblrAuthenticator.c"
 	}
 	__finally9:
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1142,212 +1248,195 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (Pu
 		g_clear_error (&_inner_error_);
 #line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		return;
-#line 1143 "TumblrAuthenticator.c"
+#line 1249 "TumblrAuthenticator.c"
 	}
 #line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 1147 "TumblrAuthenticator.c"
+#line 1253 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
-	PublishingRESTSupportTransaction* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = txn;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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_tumblr_tumblr_on_auth_request_txn_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_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
 #line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_debug ("TumblrAuthenticator.vala:224: EVENT: OAuth authentication request tran" \
-"saction completed; response = '%s'", _tmp6_);
+"saction completed; response = '%s'", _tmp3_);
 #line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp7_ = txn;
+	_g_free0 (_tmp3_);
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+	_tmp4_ = publishing_rest_support_transaction_get_response (txn);
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp9_ = _tmp8_;
+	_tmp5_ = _tmp4_;
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (self, _tmp9_);
+	publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (self, _tmp5_);
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_g_free0 (_tmp9_);
-#line 1198 "TumblrAuthenticator.c"
+	_g_free0 (_tmp5_);
+#line 1295 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                           PublishingRESTSupportTransaction* txn,
+                                                                           GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GError* _tmp5_;
+	SpitPublishingPluginHost* _tmp2_;
 #line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
 #line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp2_ = txn;
+	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_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.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_tumblr_tumblr_on_auth_request_txn_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_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_debug ("TumblrAuthenticator.vala:235: EVENT: OAuth authentication request tran" \
 "saction caused a network error");
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp5_ = err;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1233 "TumblrAuthenticator.c"
+	spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 1325 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response) {
-	const gchar* _tmp0_;
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self,
+                                                                                       const gchar* response)
+{
 	gchar* token = NULL;
 	gchar* token_secret = NULL;
 	GHashTable* data = NULL;
-	const gchar* _tmp1_;
-	GHashTable* _tmp2_;
-	GHashTable* _tmp3_;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_;
-	GHashTable* _tmp6_;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_;
-	const gchar* _tmp9_;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
+	gconstpointer _tmp2_ = NULL;
+	gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gconstpointer _tmp5_ = NULL;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_ = FALSE;
 	const gchar* _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	const gchar* _tmp12_;
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_return_if_fail (response != NULL);
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp0_ = response;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_debug ("TumblrAuthenticator.vala:240: ACTION: extracting access phase credenti" \
-"als from '%s'", _tmp0_);
+"als from '%s'", response);
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	token = NULL;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	token_secret = NULL;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp1_ = response;
-#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
+	_tmp0_ = soup_form_decode (response);
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	data = _tmp2_;
+	data = _tmp0_;
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp3_ = data;
+	_tmp1_ = data;
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+	g_hash_table_lookup_extended (_tmp1_, "oauth_token", NULL, &_tmp2_);
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_g_free0 (token);
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	token = _tmp5_;
+	token = _tmp3_;
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp6_ = data;
+	_tmp4_ = data;
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+	g_hash_table_lookup_extended (_tmp4_, "oauth_token_secret", NULL, &_tmp5_);
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_g_free0 (token_secret);
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp8_ = g_strdup (_tmp7_);
+	_tmp6_ = g_strdup (_tmp5_);
 #line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	token_secret = _tmp8_;
+	token_secret = _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp9_ = token;
+	_tmp7_ = token;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp10_ = token_secret;
+	_tmp8_ = token_secret;
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	g_debug ("TumblrAuthenticator.vala:249: access phase credentials: { token = '%s'" \
-"; token_secret = '%s' }", _tmp9_, _tmp10_);
+"; token_secret = '%s' }", _tmp7_, _tmp8_);
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	_tmp12_ = token;
+	_tmp10_ = token;
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	if (_tmp12_ == NULL) {
+	if (_tmp10_ == NULL) {
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp11_ = TRUE;
-#line 1304 "TumblrAuthenticator.c"
+		_tmp9_ = TRUE;
+#line 1393 "TumblrAuthenticator.c"
 	} else {
-		const gchar* _tmp13_;
+		const gchar* _tmp11_;
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp13_ = token_secret;
+		_tmp11_ = token_secret;
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp11_ = _tmp13_ == NULL;
-#line 1311 "TumblrAuthenticator.c"
+		_tmp9_ = _tmp11_ == NULL;
+#line 1400 "TumblrAuthenticator.c"
 	}
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-	if (_tmp11_) {
-#line 1315 "TumblrAuthenticator.c"
-		SpitPublishingPluginHost* _tmp14_;
-		GError* _tmp15_;
-		GError* _tmp16_;
+	if (_tmp9_) {
+#line 1404 "TumblrAuthenticator.c"
+		SpitPublishingPluginHost* _tmp12_;
+		GError* _tmp13_;
+		GError* _tmp14_;
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp15_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Expected " "access phase credentials to contain token and token secret but at " "least one of these is absent");
+		_tmp13_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Expected " "access phase credentials to contain token and token secret but at " "least one of these is absent");
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp16_ = _tmp15_;
+		_tmp14_ = _tmp13_;
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp14_, _tmp16_);
+		spit_publishing_plugin_host_post_error (_tmp12_, _tmp14_);
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_g_error_free0 (_tmp16_);
+		_g_error_free0 (_tmp14_);
 #line 256 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 1331 "TumblrAuthenticator.c"
+#line 1420 "TumblrAuthenticator.c"
 	} else {
-		PublishingRESTSupportOAuth1Session* _tmp17_;
-		const gchar* _tmp18_;
-		const gchar* _tmp19_;
+		PublishingRESTSupportOAuth1Session* _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp18_ = token;
+		_tmp16_ = token;
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		_tmp19_ = token_secret;
+		_tmp17_ = token_secret;
 #line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
-		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp17_, _tmp18_, _tmp19_, "");
-#line 1344 "TumblrAuthenticator.c"
+		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp15_, _tmp16_, _tmp17_, "");
+#line 1433 "TumblrAuthenticator.c"
 	}
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_g_hash_table_unref0 (data);
@@ -1355,11 +1444,13 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_
 	_g_free0 (token_secret);
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	_g_free0 (token);
-#line 1352 "TumblrAuthenticator.c"
+#line 1441 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_class_init (PublishingAuthenticatorShotwellTumblrTumblrClass * klass) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_class_init (PublishingAuthenticatorShotwellTumblrTumblrClass * klass)
+{
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	publishing_authenticator_shotwell_tumblr_tumblr_parent_class = g_type_class_peek_parent (klass);
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
@@ -1370,15 +1461,19 @@ static void publishing_authenticator_shotwell_tumblr_tumblr_class_init (Publishi
 	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_logout;
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
 	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_refresh;
-#line 1367 "TumblrAuthenticator.c"
+#line 1458 "TumblrAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_tumblr_tumblr_instance_init (PublishingAuthenticatorShotwellTumblrTumblr * self) {
+static void
+publishing_authenticator_shotwell_tumblr_tumblr_instance_init (PublishingAuthenticatorShotwellTumblrTumblr * self)
+{
 }
 
 
-GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) {
+GType
+publishing_authenticator_shotwell_tumblr_tumblr_get_type (void)
+{
 	static volatile gsize publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrTumblrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrTumblr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_instance_init, NULL };