Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

4 files changed, 1831 insertions, 1791 deletions

diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
index 967e976..480b915 100644
--- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FacebookPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler
+/* FacebookPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
  * generated from FacebookPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -47,6 +47,12 @@ typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLoca
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup;
+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
+};
+static guint publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {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))
@@ -120,7 +126,7 @@ static gint publishing_authenticator_shotwell_facebook_web_authentication_pane_l
 static gint _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_size_ = 0;
 static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_facebook_facebook_parent_class = NULL;
-static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = NULL;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID "1612018629063184"
 GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
@@ -145,8 +151,8 @@ gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_c
 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);
+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  {
@@ -184,7 +190,7 @@ static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pan
 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_finalize (GObject* obj);
+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 gint _vala_array_length (gpointer array);
@@ -192,8 +198,8 @@ static gint _vala_array_length (gpointer array);
 
 PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type) {
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url ();
 #line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -204,62 +210,62 @@ PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authent
 	_g_free0 (_tmp1_);
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 200 "FacebookPublishingAuthenticator.c"
+#line 206 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 207 "FacebookPublishingAuthenticator.c"
+#line 213 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 214 "FacebookPublishingAuthenticator.c"
+#line 220 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 234 "FacebookPublishingAuthenticator.c"
+#line 240 "FacebookPublishingAuthenticator.c"
 }
 
 
 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_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 	gchar* system_locale = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gchar* _tmp43_ = NULL;
+	const gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_;
+	gint _tmp12__length1;
+	gchar* _tmp43_;
 #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"
@@ -270,26 +276,26 @@ 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 266 "FacebookPublishingAuthenticator.c"
+#line 272 "FacebookPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp3_ = NULL;
+		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 273 "FacebookPublishingAuthenticator.c"
+#line 279 "FacebookPublishingAuthenticator.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp1_) {
-#line 277 "FacebookPublishingAuthenticator.c"
-		gchar* _tmp4_ = NULL;
+#line 283 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp4_ = g_strdup ("www");
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		result = _tmp4_;
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return result;
-#line 285 "FacebookPublishingAuthenticator.c"
+#line 291 "FacebookPublishingAuthenticator.c"
 	}
 #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp5_ = raw_system_locale;
@@ -313,7 +319,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 309 "FacebookPublishingAuthenticator.c"
+#line 315 "FacebookPublishingAuthenticator.c"
 	{
 		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
 		gint locale_lookup_collection_length1 = 0;
@@ -325,26 +331,26 @@ 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 321 "FacebookPublishingAuthenticator.c"
-			PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
+#line 327 "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 328 "FacebookPublishingAuthenticator.c"
+#line 334 "FacebookPublishingAuthenticator.c"
 			{
-				const gchar* _tmp14_ = NULL;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
-				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
+				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_;
 #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"
@@ -359,7 +365,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 					_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 355 "FacebookPublishingAuthenticator.c"
+#line 361 "FacebookPublishingAuthenticator.c"
 				}
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				_tmp18_ = locale_lookup;
@@ -367,13 +373,13 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 				_tmp19_ = _tmp18_->exception_code;
 #line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				if (_tmp19_ != NULL) {
-#line 363 "FacebookPublishingAuthenticator.c"
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
+#line 369 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_;
+					const gchar* _tmp21_;
+					const gchar* _tmp22_;
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_;
+					const gchar* _tmp24_;
+					gboolean _tmp25_;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 					_tmp20_ = locale_lookup;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -390,10 +396,10 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 					_tmp25_ = string_contains (_tmp22_, _tmp24_);
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 					if (_tmp25_) {
-#line 386 "FacebookPublishingAuthenticator.c"
-						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-						const gchar* _tmp27_ = NULL;
-						gchar* _tmp28_ = NULL;
+#line 392 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_;
+						const gchar* _tmp27_;
+						gchar* _tmp28_;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_tmp26_ = locale_lookup;
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -408,7 +414,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 						_g_free0 (system_locale);
 #line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						return result;
-#line 404 "FacebookPublishingAuthenticator.c"
+#line 410 "FacebookPublishingAuthenticator.c"
 					}
 				}
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -417,13 +423,13 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 				_tmp30_ = _tmp29_->exception_code_2;
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				if (_tmp30_ != NULL) {
-#line 413 "FacebookPublishingAuthenticator.c"
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
-					const gchar* _tmp35_ = NULL;
-					gboolean _tmp36_ = FALSE;
+#line 419 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_;
+					const gchar* _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;
 #line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -440,10 +446,10 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 					_tmp36_ = string_contains (_tmp33_, _tmp35_);
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 					if (_tmp36_) {
-#line 436 "FacebookPublishingAuthenticator.c"
-						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-						const gchar* _tmp38_ = NULL;
-						gchar* _tmp39_ = NULL;
+#line 442 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
+						const gchar* _tmp38_;
+						gchar* _tmp39_;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						_tmp37_ = locale_lookup;
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -458,7 +464,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 						_g_free0 (system_locale);
 #line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 						return result;
-#line 454 "FacebookPublishingAuthenticator.c"
+#line 460 "FacebookPublishingAuthenticator.c"
 					}
 				}
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -475,7 +481,7 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 				_g_free0 (system_locale);
 #line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 				return result;
-#line 471 "FacebookPublishingAuthenticator.c"
+#line 477 "FacebookPublishingAuthenticator.c"
 			}
 		}
 	}
@@ -487,15 +493,15 @@ static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane
 	_g_free0 (system_locale);
 #line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 483 "FacebookPublishingAuthenticator.c"
+#line 489 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void) {
 	gchar* result = NULL;
 	gchar* facebook_locale = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale ();
 #line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -510,46 +516,46 @@ 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 504 "FacebookPublishingAuthenticator.c"
+#line 510 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 529 "FacebookPublishingAuthenticator.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 535 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 537 "FacebookPublishingAuthenticator.c"
+#line 543 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 543 "FacebookPublishingAuthenticator.c"
+#line 549 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -557,238 +563,280 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	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"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 577 "FacebookPublishingAuthenticator.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 583 "FacebookPublishingAuthenticator.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 586 "FacebookPublishingAuthenticator.c"
+#line 592 "FacebookPublishingAuthenticator.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 592 "FacebookPublishingAuthenticator.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 598 "FacebookPublishingAuthenticator.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 601 "FacebookPublishingAuthenticator.c"
+#line 607 "FacebookPublishingAuthenticator.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 607 "FacebookPublishingAuthenticator.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 613 "FacebookPublishingAuthenticator.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 616 "FacebookPublishingAuthenticator.c"
+#line 622 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 620 "FacebookPublishingAuthenticator.c"
+#line 626 "FacebookPublishingAuthenticator.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 628 "FacebookPublishingAuthenticator.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 634 "FacebookPublishingAuthenticator.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 637 "FacebookPublishingAuthenticator.c"
+#line 643 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 641 "FacebookPublishingAuthenticator.c"
+#line 647 "FacebookPublishingAuthenticator.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 663 "FacebookPublishingAuthenticator.c"
+#line 669 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 676 "FacebookPublishingAuthenticator.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 688 "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 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 701 "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 1408 "/usr/share/vala-0.36/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"
+		return result;
+#line 723 "FacebookPublishingAuthenticator.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		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"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 707 "FacebookPublishingAuthenticator.c"
+#line 755 "FacebookPublishingAuthenticator.c"
 				goto __catch0_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/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 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 716 "FacebookPublishingAuthenticator.c"
+#line 764 "FacebookPublishingAuthenticator.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 732 "FacebookPublishingAuthenticator.c"
+#line 780 "FacebookPublishingAuthenticator.c"
 				goto __catch0_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/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 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 743 "FacebookPublishingAuthenticator.c"
+#line 791 "FacebookPublishingAuthenticator.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 757 "FacebookPublishingAuthenticator.c"
+#line 805 "FacebookPublishingAuthenticator.c"
 	}
 	goto __finally0;
 	__catch0_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 771 "FacebookPublishingAuthenticator.c"
+#line 819 "FacebookPublishingAuthenticator.c"
 	}
 	__finally0:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/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 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 782 "FacebookPublishingAuthenticator.c"
+#line 830 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -796,21 +844,21 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
 	gchar* loaded_url = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	const gchar* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gboolean _tmp10_;
+	const gchar* _tmp22_;
+	gboolean _tmp23_;
+	const gchar* _tmp28_;
+	gboolean _tmp29_;
 #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"
@@ -845,20 +893,20 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 	_tmp10_ = string_contains (_tmp9_, "?");
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp10_) {
-#line 839 "FacebookPublishingAuthenticator.c"
+#line 887 "FacebookPublishingAuthenticator.c"
 		gint index = 0;
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		const gchar* _tmp11_;
+		gint _tmp12_;
 		gchar* params = NULL;
-		const gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = 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;
 #line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -891,7 +939,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 		loaded_url = _tmp21_;
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_free0 (params);
-#line 885 "FacebookPublishingAuthenticator.c"
+#line 933 "FacebookPublishingAuthenticator.c"
 	}
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp22_ = loaded_url;
@@ -899,11 +947,11 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 	_tmp23_ = string_contains (_tmp22_, "login_success");
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp23_) {
-#line 893 "FacebookPublishingAuthenticator.c"
-		WebKitWebView* _tmp24_ = NULL;
-		WebKitWebView* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
+#line 941 "FacebookPublishingAuthenticator.c"
+		WebKitWebView* _tmp24_;
+		WebKitWebView* _tmp25_;
+		const gchar* _tmp26_;
+		const gchar* _tmp27_;
 #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"
@@ -915,14 +963,14 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp27_ = _tmp26_;
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		g_signal_emit_by_name (self, "login-succeeded", _tmp27_);
+		g_signal_emit (self, publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp27_);
 #line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_g_object_unref0 (_tmp25_);
 #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 916 "FacebookPublishingAuthenticator.c"
+#line 964 "FacebookPublishingAuthenticator.c"
 	}
 #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp28_ = loaded_url;
@@ -931,46 +979,46 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_r
 #line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp29_) {
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-		g_signal_emit_by_name (self, "login-failed");
+		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 930 "FacebookPublishingAuthenticator.c"
+#line 978 "FacebookPublishingAuthenticator.c"
 	}
 #line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_g_free0 (loaded_url);
-#line 934 "FacebookPublishingAuthenticator.c"
+#line 982 "FacebookPublishingAuthenticator.c"
 }
 
 
 gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty;
 #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	result = _tmp0_;
 #line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return result;
-#line 947 "FacebookPublishingAuthenticator.c"
+#line 995 "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) {
 	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const 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"
@@ -1027,21 +1075,21 @@ static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*
 	self->exception_translation_2 = _tmp11_;
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 1021 "FacebookPublishingAuthenticator.c"
+#line 1069 "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) {
 #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 1028 "FacebookPublishingAuthenticator.c"
+#line 1076 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1035 "FacebookPublishingAuthenticator.c"
+#line 1083 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1050,7 +1098,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
 	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 1044 "FacebookPublishingAuthenticator.c"
+#line 1092 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -1060,11 +1108,11 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
 	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 1054 "FacebookPublishingAuthenticator.c"
+#line 1102 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1058 "FacebookPublishingAuthenticator.c"
+#line 1106 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -1072,66 +1120,66 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_v
 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 1066 "FacebookPublishingAuthenticator.c"
+#line 1114 "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) {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (collect_values[0].v_pointer) {
-#line 1073 "FacebookPublishingAuthenticator.c"
-		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* object;
+#line 1121 "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 1080 "FacebookPublishingAuthenticator.c"
+#line 1128 "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 1084 "FacebookPublishingAuthenticator.c"
+#line 1132 "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 1088 "FacebookPublishingAuthenticator.c"
+#line 1136 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1092 "FacebookPublishingAuthenticator.c"
+#line 1140 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return NULL;
-#line 1096 "FacebookPublishingAuthenticator.c"
+#line 1144 "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) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** object_p;
+	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 1107 "FacebookPublishingAuthenticator.c"
+#line 1155 "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 1113 "FacebookPublishingAuthenticator.c"
+#line 1161 "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 1117 "FacebookPublishingAuthenticator.c"
+#line 1165 "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 1121 "FacebookPublishingAuthenticator.c"
+#line 1169 "FacebookPublishingAuthenticator.c"
 	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return NULL;
-#line 1125 "FacebookPublishingAuthenticator.c"
+#line 1173 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1145,7 +1193,7 @@ 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 1139 "FacebookPublishingAuthenticator.c"
+#line 1187 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1154,12 +1202,12 @@ static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pa
 	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 1148 "FacebookPublishingAuthenticator.c"
+#line 1196 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old;
+	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));
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1174,23 +1222,23 @@ 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 1168 "FacebookPublishingAuthenticator.c"
+#line 1216 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1172 "FacebookPublishingAuthenticator.c"
+#line 1220 "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 1178 "FacebookPublishingAuthenticator.c"
+#line 1226 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old;
+	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));
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1203,17 +1251,17 @@ 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 1197 "FacebookPublishingAuthenticator.c"
+#line 1245 "FacebookPublishingAuthenticator.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		value->data[0].v_pointer = NULL;
-#line 1201 "FacebookPublishingAuthenticator.c"
+#line 1249 "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 1207 "FacebookPublishingAuthenticator.c"
+#line 1255 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -1223,18 +1271,18 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_l
 	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 1217 "FacebookPublishingAuthenticator.c"
+#line 1265 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1224 "FacebookPublishingAuthenticator.c"
+#line 1272 "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);
@@ -1252,7 +1300,7 @@ 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 1246 "FacebookPublishingAuthenticator.c"
+#line 1294 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1271,18 +1319,18 @@ static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_
 
 
 static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self;
+	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 1271 "FacebookPublishingAuthenticator.c"
+#line 1319 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1290,68 +1338,68 @@ 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 1284 "FacebookPublishingAuthenticator.c"
+#line 1332 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
 static void publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass) {
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp3_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp4_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp5_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp6_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp7_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp8_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp9_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp10_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp11_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp12_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp14_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp16_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp21_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp25_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp28_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp30_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp33_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp35_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp36_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp38_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp39_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp41_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp42_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp43_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp3_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp4_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp5_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp6_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp7_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp8_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp9_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp10_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp11_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp12_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp14_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp16_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp21_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp25_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp28_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp30_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp33_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp35_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp36_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp38_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp39_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp41_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp42_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp43_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp44_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp45_;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	g_signal_new ("login_succeeded", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	g_signal_new ("login_failed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("es", "es-la", "ES", "es-es", NULL, NULL);
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1538,7 +1586,7 @@ 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 1532 "FacebookPublishingAuthenticator.c"
+#line 1580 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1546,13 +1594,13 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_i
 }
 
 
-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 1546 "FacebookPublishingAuthenticator.c"
+#line 1594 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1571,31 +1619,31 @@ GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_typ
 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 1565 "FacebookPublishingAuthenticator.c"
+#line 1613 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 1572 "FacebookPublishingAuthenticator.c"
+#line 1620 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1579 "FacebookPublishingAuthenticator.c"
+#line 1627 "FacebookPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host) {
 	PublishingAuthenticatorShotwellFacebookFacebook * self = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	GHashFunc _tmp2_ = NULL;
-	GEqualFunc _tmp3_ = NULL;
-	GHashTable* _tmp4_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	GHashFunc _tmp2_;
+	GEqualFunc _tmp3_;
+	GHashTable* _tmp4_;
 #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"
@@ -1620,34 +1668,34 @@ PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwe
 	self->priv->params = _tmp4_;
 #line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	return self;
-#line 1614 "FacebookPublishingAuthenticator.c"
+#line 1662 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1621 "FacebookPublishingAuthenticator.c"
+#line 1669 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp6_ = FALSE;
+	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 1635 "FacebookPublishingAuthenticator.c"
+#line 1683 "FacebookPublishingAuthenticator.c"
 		gchar* access_token = NULL;
-		gchar* _tmp1_ = NULL;
-		GHashTable* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		GVariant* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		GHashTable* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
+		GVariant* _tmp5_;
 #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp1_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
 #line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1670,15 +1718,15 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_authenticat
 		_g_free0 (access_token);
 #line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 1664 "FacebookPublishingAuthenticator.c"
+#line 1712 "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 1670 "FacebookPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		SpitPublishingPluginHost* _tmp8_ = NULL;
+#line 1718 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp7_;
+		SpitPublishingPluginHost* _tmp8_;
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp7_ = self->priv->host;
 #line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1687,11 +1735,11 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_authenticat
 		_tmp8_ = 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 1681 "FacebookPublishingAuthenticator.c"
+#line 1729 "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 1685 "FacebookPublishingAuthenticator.c"
+#line 1733 "FacebookPublishingAuthenticator.c"
 	}
 }
 
@@ -1705,22 +1753,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 1699 "FacebookPublishingAuthenticator.c"
+#line 1747 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1706 "FacebookPublishingAuthenticator.c"
+#line 1754 "FacebookPublishingAuthenticator.c"
 }
 
 
 static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellFacebookFacebook * self;
 	GHashTable* result = NULL;
-	GHashTable* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
 #line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1731,7 +1779,7 @@ 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 1725 "FacebookPublishingAuthenticator.c"
+#line 1773 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1743,7 +1791,7 @@ 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 1736 "FacebookPublishingAuthenticator.c"
+#line 1784 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1753,7 +1801,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_logout (Spi
 	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 1746 "FacebookPublishingAuthenticator.c"
+#line 1794 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1761,16 +1809,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (Sp
 	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 1754 "FacebookPublishingAuthenticator.c"
+#line 1802 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self) {
 	gboolean result = FALSE;
 	gchar* token = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp3_;
 #line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), FALSE);
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1781,19 +1829,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 1774 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp2_ = NULL;
+#line 1822 "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 1780 "FacebookPublishingAuthenticator.c"
+#line 1828 "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 1784 "FacebookPublishingAuthenticator.c"
+#line 1832 "FacebookPublishingAuthenticator.c"
 	}
 #line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp3_ = token;
@@ -1803,14 +1851,14 @@ 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 1794 "FacebookPublishingAuthenticator.c"
+#line 1842 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 231 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), NULL);
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1821,13 +1869,13 @@ 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 1812 "FacebookPublishingAuthenticator.c"
+#line 1860 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	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"
@@ -1838,20 +1886,20 @@ static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_a
 	_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 1829 "FacebookPublishingAuthenticator.c"
+#line 1877 "FacebookPublishingAuthenticator.c"
 }
 
 
 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 1836 "FacebookPublishingAuthenticator.c"
+#line 1884 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1865,7 +1913,7 @@ 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 1855 "FacebookPublishingAuthenticator.c"
+#line 1903 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1877,31 +1925,31 @@ 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 1866 "FacebookPublishingAuthenticator.c"
+#line 1914 "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) {
 #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 1873 "FacebookPublishingAuthenticator.c"
+#line 1921 "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) {
 #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 1880 "FacebookPublishingAuthenticator.c"
+#line 1928 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp5_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp5_;
 #line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -1931,12 +1979,12 @@ 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 1919 "FacebookPublishingAuthenticator.c"
+#line 1967 "FacebookPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #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"
@@ -1948,7 +1996,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane
 	_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 1935 "FacebookPublishingAuthenticator.c"
+#line 1983 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -1960,75 +2008,75 @@ 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 1946 "FacebookPublishingAuthenticator.c"
+#line 1994 "FacebookPublishingAuthenticator.c"
 }
 
 
 static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1973 "FacebookPublishingAuthenticator.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2021 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1981 "FacebookPublishingAuthenticator.c"
+#line 2029 "FacebookPublishingAuthenticator.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1987 "FacebookPublishingAuthenticator.c"
+#line 2035 "FacebookPublishingAuthenticator.c"
 	}
 }
 
 
 static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* decoded_uri = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* access_token = NULL;
 	gint index = 0;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	const gchar* _tmp12_ = NULL;
+	const gchar* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	const gchar* _tmp12_;
 	gchar* trailing_params = NULL;
-	const gchar* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	GHashTable* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	GVariant* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
+	const gchar* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	const gchar* _tmp25_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	GHashTable* _tmp31_;
+	gchar* _tmp32_;
+	const gchar* _tmp33_;
+	GVariant* _tmp34_;
+	const gchar* _tmp35_;
 #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"
@@ -2056,13 +2104,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 	_tmp5_ = index;
 #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp5_ >= 0) {
-#line 2041 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
+#line 2089 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp6_;
+		gint _tmp7_;
+		const gchar* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp6_ = decoded_uri;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2079,16 +2127,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 		_g_free0 (access_token);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		access_token = _tmp11_;
-#line 2064 "FacebookPublishingAuthenticator.c"
+#line 2112 "FacebookPublishingAuthenticator.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp12_ = access_token;
 #line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp12_ == NULL) {
-#line 2070 "FacebookPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
+#line 2118 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp13_;
+		GError* _tmp14_;
+		GError* _tmp15_;
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp13_ = self->priv->host;
 #line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2105,7 +2153,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 		_g_free0 (decoded_uri);
 #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		return;
-#line 2090 "FacebookPublishingAuthenticator.c"
+#line 2138 "FacebookPublishingAuthenticator.c"
 	}
 #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	trailing_params = NULL;
@@ -2119,13 +2167,13 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 	_tmp18_ = index;
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp18_ >= 0) {
-#line 2104 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		const gchar* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
+#line 2152 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp19_;
+		gint _tmp20_;
+		const gchar* _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gchar* _tmp24_;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp19_ = access_token;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2142,16 +2190,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 		_g_free0 (trailing_params);
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		trailing_params = _tmp24_;
-#line 2127 "FacebookPublishingAuthenticator.c"
+#line 2175 "FacebookPublishingAuthenticator.c"
 	}
 #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp25_ = trailing_params;
 #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	if (_tmp25_ != NULL) {
-#line 2133 "FacebookPublishingAuthenticator.c"
-		const gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
+#line 2181 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp26_;
+		const gchar* _tmp27_;
+		gchar* _tmp28_;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		_tmp26_ = access_token;
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
@@ -2162,7 +2210,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_
 		_g_free0 (access_token);
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 		access_token = _tmp28_;
-#line 2147 "FacebookPublishingAuthenticator.c"
+#line 2195 "FacebookPublishingAuthenticator.c"
 	}
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	_tmp29_ = access_token;
@@ -2196,7 +2244,7 @@ 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 2181 "FacebookPublishingAuthenticator.c"
+#line 2229 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -2207,7 +2255,7 @@ static void publishing_authenticator_shotwell_facebook_facebook_class_init (Publ
 	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 2192 "FacebookPublishingAuthenticator.c"
+#line 2240 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -2215,16 +2263,16 @@ static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_
 #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"
-	iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_authenticate;
+	iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_authenticate;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_can_logout;
+	iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_can_logout;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter;
+	iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_logout;
+	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 2209 "FacebookPublishingAuthenticator.c"
+	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_facebook_facebook_real_refresh;
+#line 2257 "FacebookPublishingAuthenticator.c"
 }
 
 
@@ -2233,11 +2281,11 @@ static void publishing_authenticator_shotwell_facebook_facebook_instance_init (P
 	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 2218 "FacebookPublishingAuthenticator.c"
+#line 2266 "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);
@@ -2249,7 +2297,7 @@ 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 2234 "FacebookPublishingAuthenticator.c"
+#line 2282 "FacebookPublishingAuthenticator.c"
 }
 
 
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index d0d74d4..ab19db3 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FlickrPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler
+/* FlickrPublishingAuthenticator.c generated by valac 0.36.6, the Vala compiler
  * generated from FlickrPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -76,6 +76,11 @@ typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass Publishin
 typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL
+};
+static guint publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr))
@@ -180,9 +185,9 @@ static gpointer publishing_authenticator_shotwell_flickr_session_parent_class =
 static gpointer publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = NULL;
-static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
@@ -218,7 +223,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token
 gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self);
 gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self);
 gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self);
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj);
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET "d0960565e03547c1"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Flickr.\n" \
@@ -253,7 +258,7 @@ static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue
 static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
 static void g_cclosure_user_marshal_VOID__OBJECT_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_flickr_pin_entry_pane_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj);
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrPrivate))
 enum  {
@@ -304,15 +309,15 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 static GVariant* _variant_new3 (gchar* value);
 static GVariant* _variant_new4 (gchar* value);
 static GVariant* _variant_new5 (gchar* value);
-static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj);
+static void publishing_authenticator_shotwell_flickr_flickr_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);
 
 
 PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -325,22 +330,22 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw
 	publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 326 "FlickrPublishingAuthenticator.c"
+#line 331 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, method);
-#line 333 "FlickrPublishingAuthenticator.c"
+#line 338 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 	PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -357,26 +362,26 @@ PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotw
 	publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 358 "FlickrPublishingAuthenticator.c"
+#line 363 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new_with_uri (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 #line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 365 "FlickrPublishingAuthenticator.c"
+#line 370 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self) {
 	PublishingAuthenticatorShotwellFlickrSession* session = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION (self));
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -415,14 +420,14 @@ static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments
 	_g_free0 (_tmp6_);
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_session_unref0 (session);
-#line 416 "FlickrPublishingAuthenticator.c"
+#line 421 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingAuthenticatorShotwellFlickrTransaction * self;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransaction);
@@ -444,7 +449,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P
 			g_propagate_error (error, _inner_error_);
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 445 "FlickrPublishingAuthenticator.c"
+#line 450 "FlickrPublishingAuthenticator.c"
 		} else {
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			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);
@@ -452,7 +457,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_real_execute (P
 			g_clear_error (&_inner_error_);
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 453 "FlickrPublishingAuthenticator.c"
+#line 458 "FlickrPublishingAuthenticator.c"
 		}
 	}
 }
@@ -462,8 +467,8 @@ static void publishing_authenticator_shotwell_flickr_transaction_class_init (Pub
 #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
-#line 464 "FlickrPublishingAuthenticator.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
+#line 469 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -489,14 +494,14 @@ PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_
 	self = (PublishingAuthenticatorShotwellFlickrSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 490 "FlickrPublishingAuthenticator.c"
+#line 495 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_new (void) {
 #line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION);
-#line 497 "FlickrPublishingAuthenticator.c"
+#line 502 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -505,54 +510,54 @@ static gboolean publishing_authenticator_shotwell_flickr_session_real_is_authent
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 #line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = self->priv->access_phase_token;
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp2_ != NULL) {
-#line 513 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp3_ = NULL;
+#line 518 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp3_;
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp3_ = self->priv->access_phase_token_secret;
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 519 "FlickrPublishingAuthenticator.c"
+#line 524 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp1_ = FALSE;
-#line 523 "FlickrPublishingAuthenticator.c"
+#line 528 "FlickrPublishingAuthenticator.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp1_) {
-#line 527 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp4_ = NULL;
+#line 532 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp4_;
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp4_ = self->priv->username;
 #line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 533 "FlickrPublishingAuthenticator.c"
+#line 538 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp0_ = FALSE;
-#line 537 "FlickrPublishingAuthenticator.c"
+#line 542 "FlickrPublishingAuthenticator.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	result = _tmp0_;
 #line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 543 "FlickrPublishingAuthenticator.c"
+#line 548 "FlickrPublishingAuthenticator.c"
 }
 
 
 void publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
 #line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -587,7 +592,7 @@ void publishing_authenticator_shotwell_flickr_session_authenticate_from_persiste
 	self->priv->username = _tmp5_;
 #line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 588 "FlickrPublishingAuthenticator.c"
+#line 593 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -606,15 +611,15 @@ void publishing_authenticator_shotwell_flickr_session_deauthenticate (Publishing
 	_g_free0 (self->priv->username);
 #line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->username = NULL;
-#line 607 "FlickrPublishingAuthenticator.c"
+#line 612 "FlickrPublishingAuthenticator.c"
 }
 
 
 void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
 #line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -637,62 +642,62 @@ void publishing_authenticator_shotwell_flickr_session_set_api_credentials (Publi
 	_g_free0 (self->priv->consumer_secret);
 #line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->consumer_secret = _tmp3_;
-#line 638 "FlickrPublishingAuthenticator.c"
+#line 643 "FlickrPublishingAuthenticator.c"
 }
 
 
 void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn) {
 	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PublishingRESTSupportArgument** _tmp8_ = NULL;
-	gint base_string_arguments_length1 = 0;
-	gint _base_string_arguments_size_ = 0;
+	PublishingRESTSupportTransaction* _tmp6_;
+	gint _tmp7_;
+	PublishingRESTSupportArgument** _tmp8_;
+	gint base_string_arguments_length1;
+	gint _base_string_arguments_size_;
 	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	gint _tmp10_ = 0;
-	PublishingRESTSupportArgument** _tmp11_ = NULL;
-	gint sorted_args_length1 = 0;
-	gint _sorted_args_size_ = 0;
+	PublishingRESTSupportArgument** _tmp9_;
+	gint _tmp9__length1;
+	gint _tmp10_;
+	PublishingRESTSupportArgument** _tmp11_;
+	gint sorted_args_length1;
+	gint _sorted_args_size_;
 	gchar* arguments_string = NULL;
-	gchar* _tmp12_ = NULL;
+	gchar* _tmp12_;
 	gchar* signing_key = NULL;
-	const gchar* _tmp35_ = NULL;
+	const gchar* _tmp35_;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	PublishingRESTSupportTransaction* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	const gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	const gchar* _tmp66_ = NULL;
+	const gchar* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	PublishingRESTSupportTransaction* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	const gchar* _tmp61_;
+	gchar* _tmp62_;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	const gchar* _tmp66_;
 	gchar* signature = NULL;
-	const gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	const gchar* _tmp69_ = NULL;
-	gchar* _tmp70_ = NULL;
-	const gchar* _tmp71_ = NULL;
-	PublishingRESTSupportTransaction* _tmp72_ = NULL;
-	const gchar* _tmp73_ = NULL;
+	const gchar* _tmp67_;
+	gchar* _tmp68_;
+	const gchar* _tmp69_;
+	gchar* _tmp70_;
+	const gchar* _tmp71_;
+	PublishingRESTSupportTransaction* _tmp72_;
+	const gchar* _tmp73_;
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -744,50 +749,50 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 	_tmp12_ = g_strdup ("");
 #line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	arguments_string = _tmp12_;
-#line 744 "FlickrPublishingAuthenticator.c"
+#line 749 "FlickrPublishingAuthenticator.c"
 	{
 		gint i = 0;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		i = 0;
-#line 749 "FlickrPublishingAuthenticator.c"
+#line 754 "FlickrPublishingAuthenticator.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			_tmp13_ = TRUE;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			while (TRUE) {
-#line 756 "FlickrPublishingAuthenticator.c"
-				gint _tmp15_ = 0;
-				PublishingRESTSupportArgument** _tmp16_ = NULL;
-				gint _tmp16__length1 = 0;
-				const gchar* _tmp17_ = NULL;
-				PublishingRESTSupportArgument** _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				gint _tmp19_ = 0;
-				PublishingRESTSupportArgument* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				PublishingRESTSupportArgument** _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
-				gint _tmp25_ = 0;
-				PublishingRESTSupportArgument* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				gchar* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gint _tmp31_ = 0;
-				PublishingRESTSupportArgument** _tmp32_ = NULL;
-				gint _tmp32__length1 = 0;
+#line 761 "FlickrPublishingAuthenticator.c"
+				gint _tmp15_;
+				PublishingRESTSupportArgument** _tmp16_;
+				gint _tmp16__length1;
+				const gchar* _tmp17_;
+				PublishingRESTSupportArgument** _tmp18_;
+				gint _tmp18__length1;
+				gint _tmp19_;
+				PublishingRESTSupportArgument* _tmp20_;
+				const gchar* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				PublishingRESTSupportArgument** _tmp24_;
+				gint _tmp24__length1;
+				gint _tmp25_;
+				PublishingRESTSupportArgument* _tmp26_;
+				const gchar* _tmp27_;
+				gchar* _tmp28_;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				gint _tmp31_;
+				PublishingRESTSupportArgument** _tmp32_;
+				gint _tmp32__length1;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 				if (!_tmp13_) {
-#line 781 "FlickrPublishingAuthenticator.c"
-					gint _tmp14_ = 0;
+#line 786 "FlickrPublishingAuthenticator.c"
+					gint _tmp14_;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 					_tmp14_ = i;
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 					i = _tmp14_ + 1;
-#line 787 "FlickrPublishingAuthenticator.c"
+#line 792 "FlickrPublishingAuthenticator.c"
 				}
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 				_tmp13_ = FALSE;
@@ -801,7 +806,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 				if (!(_tmp15_ < _tmp16__length1)) {
 #line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 					break;
-#line 801 "FlickrPublishingAuthenticator.c"
+#line 806 "FlickrPublishingAuthenticator.c"
 				}
 #line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 				_tmp17_ = arguments_string;
@@ -851,9 +856,9 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 				_tmp32__length1 = sorted_args_length1;
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 				if (_tmp31_ < (_tmp32__length1 - 1)) {
-#line 851 "FlickrPublishingAuthenticator.c"
-					const gchar* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
+#line 856 "FlickrPublishingAuthenticator.c"
+					const gchar* _tmp33_;
+					gchar* _tmp34_;
 #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 					_tmp33_ = arguments_string;
 #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -862,7 +867,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 					_g_free0 (arguments_string);
 #line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 					arguments_string = _tmp34_;
-#line 862 "FlickrPublishingAuthenticator.c"
+#line 867 "FlickrPublishingAuthenticator.c"
 				}
 			}
 		}
@@ -873,12 +878,12 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 	_tmp35_ = self->priv->access_phase_token_secret;
 #line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp35_ != NULL) {
-#line 873 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
+#line 878 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp36_;
+		gchar* _tmp37_;
+		gchar* _tmp38_;
+		const gchar* _tmp39_;
+		gchar* _tmp40_;
 #line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_debug ("FlickrPublishingAuthenticator.vala:102: access phase token secret avai" \
 "lable; using it as signing key");
@@ -898,19 +903,19 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 		signing_key = _tmp40_;
 #line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp38_);
-#line 897 "FlickrPublishingAuthenticator.c"
+#line 902 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp41_ = NULL;
+		const gchar* _tmp41_;
 #line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp41_ = self->priv->request_phase_token_secret;
 #line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		if (_tmp41_ != NULL) {
-#line 904 "FlickrPublishingAuthenticator.c"
-			const gchar* _tmp42_ = NULL;
-			gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			const gchar* _tmp45_ = NULL;
-			gchar* _tmp46_ = NULL;
+#line 909 "FlickrPublishingAuthenticator.c"
+			const gchar* _tmp42_;
+			gchar* _tmp43_;
+			gchar* _tmp44_;
+			const gchar* _tmp45_;
+			gchar* _tmp46_;
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_debug ("FlickrPublishingAuthenticator.vala:106: request phase token secret ava" \
 "ilable; using it as signing key");
@@ -930,10 +935,10 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 			signing_key = _tmp46_;
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			_g_free0 (_tmp44_);
-#line 928 "FlickrPublishingAuthenticator.c"
+#line 933 "FlickrPublishingAuthenticator.c"
 		} else {
-			const gchar* _tmp47_ = NULL;
-			gchar* _tmp48_ = NULL;
+			const gchar* _tmp47_;
+			gchar* _tmp48_;
 #line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_debug ("FlickrPublishingAuthenticator.vala:110: %s", "neither access phase nor request phase token secrets available; using " \
 "API " "key as signing key");
@@ -945,7 +950,7 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 			_g_free0 (signing_key);
 #line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			signing_key = _tmp48_;
-#line 942 "FlickrPublishingAuthenticator.c"
+#line 947 "FlickrPublishingAuthenticator.c"
 		}
 	}
 #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1040,15 +1045,15 @@ void publishing_authenticator_shotwell_flickr_session_sign_transaction (Publishi
 	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (http_method);
-#line 1037 "FlickrPublishingAuthenticator.c"
+#line 1042 "FlickrPublishingAuthenticator.c"
 }
 
 
 void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
 #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1071,17 +1076,17 @@ void publishing_authenticator_shotwell_flickr_session_set_request_phase_credenti
 	_g_free0 (self->priv->request_phase_token_secret);
 #line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->request_phase_token_secret = _tmp3_;
-#line 1068 "FlickrPublishingAuthenticator.c"
+#line 1073 "FlickrPublishingAuthenticator.c"
 }
 
 
 void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
 #line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1116,25 +1121,25 @@ void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentia
 	self->priv->username = _tmp5_;
 #line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 1113 "FlickrPublishingAuthenticator.c"
+#line 1118 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
 	GTimeVal currtime = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GTimeVal _tmp4_ = {0};
-	glong _tmp5_ = 0L;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1175,50 +1180,50 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (Publish
 	result = _tmp11_;
 #line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1172 "FlickrPublishingAuthenticator.c"
+#line 1177 "FlickrPublishingAuthenticator.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1195 "FlickrPublishingAuthenticator.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1200 "FlickrPublishingAuthenticator.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1203 "FlickrPublishingAuthenticator.c"
+#line 1208 "FlickrPublishingAuthenticator.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1215 "FlickrPublishingAuthenticator.c"
+#line 1220 "FlickrPublishingAuthenticator.c"
 	}
 }
 
@@ -1227,133 +1232,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	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"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1239 "FlickrPublishingAuthenticator.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "FlickrPublishingAuthenticator.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1245 "FlickrPublishingAuthenticator.c"
+#line 1250 "FlickrPublishingAuthenticator.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1249 "FlickrPublishingAuthenticator.c"
+#line 1254 "FlickrPublishingAuthenticator.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1253 "FlickrPublishingAuthenticator.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1258 "FlickrPublishingAuthenticator.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1265 "FlickrPublishingAuthenticator.c"
+#line 1270 "FlickrPublishingAuthenticator.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1275 "FlickrPublishingAuthenticator.c"
+#line 1280 "FlickrPublishingAuthenticator.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1281 "FlickrPublishingAuthenticator.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1286 "FlickrPublishingAuthenticator.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1295 "FlickrPublishingAuthenticator.c"
+#line 1300 "FlickrPublishingAuthenticator.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1305 "FlickrPublishingAuthenticator.c"
+#line 1310 "FlickrPublishingAuthenticator.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1311 "FlickrPublishingAuthenticator.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "FlickrPublishingAuthenticator.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1320 "FlickrPublishingAuthenticator.c"
+#line 1325 "FlickrPublishingAuthenticator.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1340 "FlickrPublishingAuthenticator.c"
+#line 1345 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	gint64 _tmp0_ = 0LL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1372,15 +1377,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (Pub
 	result = _tmp4_;
 #line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1369 "FlickrPublishingAuthenticator.c"
+#line 1374 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1395,15 +1400,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (Publis
 	result = _tmp2_;
 #line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1392 "FlickrPublishingAuthenticator.c"
+#line 1397 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1418,15 +1423,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token
 	result = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1415 "FlickrPublishingAuthenticator.c"
+#line 1420 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1441,15 +1446,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (
 	result = _tmp2_;
 #line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1438 "FlickrPublishingAuthenticator.c"
+#line 1443 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1464,15 +1469,15 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_s
 	result = _tmp2_;
 #line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1461 "FlickrPublishingAuthenticator.c"
+#line 1466 "FlickrPublishingAuthenticator.c"
 }
 
 
 gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self) {
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
 #line 179 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1487,7 +1492,7 @@ gchar* publishing_authenticator_shotwell_flickr_session_get_username (Publishing
 	result = _tmp2_;
 #line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1484 "FlickrPublishingAuthenticator.c"
+#line 1489 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1499,8 +1504,8 @@ static void publishing_authenticator_shotwell_flickr_session_class_init (Publish
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate));
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
-#line 1497 "FlickrPublishingAuthenticator.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
+#line 1502 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1521,11 +1526,11 @@ static void publishing_authenticator_shotwell_flickr_session_instance_init (Publ
 	self->priv->consumer_key = NULL;
 #line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->consumer_secret = NULL;
-#line 1518 "FlickrPublishingAuthenticator.c"
+#line 1523 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingAuthenticatorShotwellFlickrSession * self;
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
@@ -1545,7 +1550,7 @@ static void publishing_authenticator_shotwell_flickr_session_finalize (Publishin
 	_g_free0 (self->priv->consumer_secret);
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_flickr_session_parent_class)->finalize (obj);
-#line 1542 "FlickrPublishingAuthenticator.c"
+#line 1547 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1563,7 +1568,7 @@ GType publishing_authenticator_shotwell_flickr_session_get_type (void) {
 
 PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session) {
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1572,21 +1577,21 @@ PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishin
 	self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1569 "FlickrPublishingAuthenticator.c"
+#line 1574 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session) {
 #line 190 "/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 1576 "FlickrPublishingAuthenticator.c"
+#line 1581 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) {
 #line 189 "/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 1583 "FlickrPublishingAuthenticator.c"
+#line 1588 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1608,11 +1613,11 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
 
 PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1637,21 +1642,21 @@ PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_aut
 	_g_free0 (_tmp4_);
 #line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1634 "FlickrPublishingAuthenticator.c"
+#line 1639 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
 #line 197 "/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 1641 "FlickrPublishingAuthenticator.c"
+#line 1646 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) {
 #line 196 "/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 1648 "FlickrPublishingAuthenticator.c"
+#line 1653 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1674,35 +1679,35 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge
 static gpointer _g_object_ref0 (gpointer self) {
 #line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1671 "FlickrPublishingAuthenticator.c"
+#line 1676 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
 	PublishingAuthenticatorShotwellFlickrPinEntryPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
-	GSList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkEntry* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	GtkBuilder* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GSList* _tmp4_;
+	GSList* _tmp5_;
+	guint _tmp6_;
+	GtkBuilder* _tmp7_;
+	GObject* _tmp8_;
+	GtkLabel* _tmp9_;
+	GtkBuilder* _tmp10_;
+	GObject* _tmp11_;
+	GtkLabel* _tmp12_;
+	GtkBuilder* _tmp13_;
+	GObject* _tmp14_;
+	GtkEntry* _tmp15_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_;
+	GtkButton* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkBox* _tmp22_;
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1789,20 +1794,20 @@ PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shot
 	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1786 "FlickrPublishingAuthenticator.c"
+#line 1791 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_new (GtkBuilder* builder) {
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 1793 "FlickrPublishingAuthenticator.c"
+#line 1798 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1810,16 +1815,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_emit_by_name (self, "proceed", self, _tmp1_);
-#line 1808 "FlickrPublishingAuthenticator.c"
+	g_signal_emit (self, publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL], 0, self, _tmp1_);
+#line 1813 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
+	GtkButton* _tmp0_;
+	GtkEntry* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
 #line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1832,15 +1837,15 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry
 	_tmp3_ = _tmp2_;
 #line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 1829 "FlickrPublishingAuthenticator.c"
+#line 1834 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1851,7 +1856,7 @@ static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_g
 	result = _tmp1_;
 #line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1848 "FlickrPublishingAuthenticator.c"
+#line 1853 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1864,28 +1869,28 @@ static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 1861 "FlickrPublishingAuthenticator.c"
+#line 1866 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1868 "FlickrPublishingAuthenticator.c"
+#line 1873 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1875 "FlickrPublishingAuthenticator.c"
+#line 1880 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
+	GtkEntry* _tmp1_;
 #line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
 #line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1896,16 +1901,16 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane
 	_tmp1_ = self->priv->pin_entry;
 #line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 1893 "FlickrPublishingAuthenticator.c"
+#line 1898 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkEntry* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	GtkButton* _tmp0_;
+	guint _tmp1_;
+	GtkEntry* _tmp2_;
+	guint _tmp3_;
 #line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
 #line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -1920,7 +1925,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
 #line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 1917 "FlickrPublishingAuthenticator.c"
+#line 1922 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1939,19 +1944,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa
 		data1 = closure->data;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1936 "FlickrPublishingAuthenticator.c"
+#line 1941 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		data2 = closure->data;
-#line 1942 "FlickrPublishingAuthenticator.c"
+#line 1947 "FlickrPublishingAuthenticator.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 1948 "FlickrPublishingAuthenticator.c"
+#line 1953 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1963,8 +1968,8 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_class_init (
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 1961 "FlickrPublishingAuthenticator.c"
+	publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
+#line 1966 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1972,14 +1977,14 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publish
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 1976 "FlickrPublishingAuthenticator.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled;
+#line 1981 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1998,11 +2003,11 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_instance_ini
 	self->priv->explanatory_text = NULL;
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv->builder = NULL;
-#line 1995 "FlickrPublishingAuthenticator.c"
+#line 2000 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj) {
 	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
@@ -2020,7 +2025,7 @@ static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GO
 	_g_object_unref0 (self->priv->builder);
 #line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 2017 "FlickrPublishingAuthenticator.c"
+#line 2022 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2041,54 +2046,54 @@ GType publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type (void) {
 static void _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
 #line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2038 "FlickrPublishingAuthenticator.c"
+#line 2043 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 2045 "FlickrPublishingAuthenticator.c"
+#line 2050 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _g_variant_unref0_ (gpointer var) {
 #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 2052 "FlickrPublishingAuthenticator.c"
+#line 2057 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GVariant* _variant_new1 (const gchar* value) {
 #line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2059 "FlickrPublishingAuthenticator.c"
+#line 2064 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GVariant* _variant_new2 (const gchar* value) {
 #line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2066 "FlickrPublishingAuthenticator.c"
+#line 2071 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	GHashFunc _tmp2_ = NULL;
-	GEqualFunc _tmp3_ = NULL;
-	GHashTable* _tmp4_ = NULL;
-	GHashTable* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
-	GHashTable* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GVariant* _tmp10_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp11_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp12_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp13_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	GHashFunc _tmp2_;
+	GEqualFunc _tmp3_;
+	GHashTable* _tmp4_;
+	GHashTable* _tmp5_;
+	gchar* _tmp6_;
+	GVariant* _tmp7_;
+	GHashTable* _tmp8_;
+	gchar* _tmp9_;
+	GVariant* _tmp10_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp11_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp12_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp13_;
 #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2143,14 +2148,14 @@ PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_f
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
 #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 2140 "FlickrPublishingAuthenticator.c"
+#line 2145 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
 #line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
-#line 2147 "FlickrPublishingAuthenticator.c"
+#line 2152 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2163,7 +2168,7 @@ void publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_sessi
 	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (self, "");
 #line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (self, "");
-#line 2160 "FlickrPublishingAuthenticator.c"
+#line 2165 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2171,9 +2176,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 288 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), FALSE);
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2186,9 +2191,9 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
 	_g_free0 (_tmp3_);
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp4_) {
-#line 2183 "FlickrPublishingAuthenticator.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 2188 "FlickrPublishingAuthenticator.c"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (self);
 #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2197,17 +2202,17 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
 		_tmp1_ = _tmp6_ != NULL;
 #line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp6_);
-#line 2194 "FlickrPublishingAuthenticator.c"
+#line 2199 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp1_ = FALSE;
-#line 2198 "FlickrPublishingAuthenticator.c"
+#line 2203 "FlickrPublishingAuthenticator.c"
 	}
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp1_) {
-#line 2202 "FlickrPublishingAuthenticator.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+#line 2207 "FlickrPublishingAuthenticator.c"
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp7_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (self);
 #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2216,24 +2221,24 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_se
 		_tmp0_ = _tmp8_ != NULL;
 #line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp8_);
-#line 2213 "FlickrPublishingAuthenticator.c"
+#line 2218 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp0_ = FALSE;
-#line 2217 "FlickrPublishingAuthenticator.c"
+#line 2222 "FlickrPublishingAuthenticator.c"
 	}
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	result = _tmp0_;
 #line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2223 "FlickrPublishingAuthenticator.c"
+#line 2228 "FlickrPublishingAuthenticator.c"
 }
 
 
 static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2244,13 +2249,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
 	result = _tmp1_;
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2241 "FlickrPublishingAuthenticator.c"
+#line 2246 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2261,14 +2266,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
 	_tmp1_ = username;
 #line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 2258 "FlickrPublishingAuthenticator.c"
+#line 2263 "FlickrPublishingAuthenticator.c"
 }
 
 
 static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 302 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
 #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2279,13 +2284,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
 	result = _tmp1_;
 #line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2276 "FlickrPublishingAuthenticator.c"
+#line 2281 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2296,14 +2301,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
 	_tmp1_ = token;
 #line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 2293 "FlickrPublishingAuthenticator.c"
+#line 2298 "FlickrPublishingAuthenticator.c"
 }
 
 
 static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2314,13 +2319,13 @@ static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_acc
 	result = _tmp1_;
 #line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2311 "FlickrPublishingAuthenticator.c"
+#line 2316 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2331,27 +2336,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_acces
 	_tmp1_ = secret;
 #line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 2328 "FlickrPublishingAuthenticator.c"
+#line 2333 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
 #line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (self);
 #line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp0_) {
-#line 2341 "FlickrPublishingAuthenticator.c"
-		PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 2346 "FlickrPublishingAuthenticator.c"
+		PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_debug ("FlickrPublishingAuthenticator.vala:320: attempt start: a persistent se" \
 "ssion is available; using it");
@@ -2377,14 +2382,14 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (S
 		_g_free0 (_tmp5_);
 #line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp3_);
-#line 2373 "FlickrPublishingAuthenticator.c"
+#line 2378 "FlickrPublishingAuthenticator.c"
 	} else {
 #line 325 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_debug ("FlickrPublishingAuthenticator.vala:325: attempt start: no persistent s" \
 "ession available; showing login welcome pane");
 #line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
-#line 2379 "FlickrPublishingAuthenticator.c"
+#line 2384 "FlickrPublishingAuthenticator.c"
 	}
 }
 
@@ -2398,22 +2403,22 @@ static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout
 	result = TRUE;
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2393 "FlickrPublishingAuthenticator.c"
+#line 2398 "FlickrPublishingAuthenticator.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
 #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 2400 "FlickrPublishingAuthenticator.c"
+#line 2405 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 	GHashTable* result = NULL;
-	GHashTable* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
 #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2424,13 +2429,13 @@ static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_auth
 	result = _tmp1_;
 #line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2419 "FlickrPublishingAuthenticator.c"
+#line 2424 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
 #line 338 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
 #line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2439,7 +2444,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPub
 	publishing_authenticator_shotwell_flickr_session_deauthenticate (_tmp0_);
 #line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (self);
-#line 2434 "FlickrPublishingAuthenticator.c"
+#line 2439 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2447,20 +2452,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPu
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 #line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 2442 "FlickrPublishingAuthenticator.c"
+#line 2447 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
 #line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2449 "FlickrPublishingAuthenticator.c"
+#line 2454 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 347 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 348 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2474,7 +2479,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcom
 	_tmp1_ = self->priv->host;
 #line 351 "/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 2468 "FlickrPublishingAuthenticator.c"
+#line 2473 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2486,31 +2491,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_logi
 "tton in the welcome pane");
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
-#line 2479 "FlickrPublishingAuthenticator.c"
+#line 2484 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 2486 "FlickrPublishingAuthenticator.c"
+#line 2491 "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) {
 #line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 2493 "FlickrPublishingAuthenticator.c"
+#line 2498 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp3_ = NULL;
-	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -2524,20 +2528,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 #line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = self->priv->host;
 #line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = _ ("Preparing for login…");
-#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Preparing for login…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp3_);
+	_tmp3_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp2_);
 #line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	txn = _tmp4_;
+	txn = _tmp3_;
 #line 367 "/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 368 "/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 2529 "FlickrPublishingAuthenticator.c"
+#line 2531 "FlickrPublishingAuthenticator.c"
 	{
 #line 371 "/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_);
@@ -2545,7 +2547,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2537 "FlickrPublishingAuthenticator.c"
+#line 2539 "FlickrPublishingAuthenticator.c"
 				goto __catch1_spit_publishing_publishing_error;
 			}
 #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2556,28 +2558,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 			g_clear_error (&_inner_error_);
 #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 2548 "FlickrPublishingAuthenticator.c"
+#line 2550 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally1;
 	__catch1_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		err = _inner_error_;
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp5_ = self->priv->host;
+		_tmp4_ = self->priv->host;
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = err;
+		_tmp5_ = err;
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 2569 "FlickrPublishingAuthenticator.c"
+#line 2571 "FlickrPublishingAuthenticator.c"
 	}
 	__finally1:
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2590,25 +2592,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		g_clear_error (&_inner_error_);
 #line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 2582 "FlickrPublishingAuthenticator.c"
+#line 2584 "FlickrPublishingAuthenticator.c"
 	}
 #line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2586 "FlickrPublishingAuthenticator.c"
+#line 2588 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2646,17 +2648,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
 	publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_);
 #line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp9_);
-#line 2637 "FlickrPublishingAuthenticator.c"
+#line 2639 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GError* _tmp5_;
 #line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2684,27 +2686,27 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
 	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 395 "/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 2674 "FlickrPublishingAuthenticator.c"
+#line 2676 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* oauth_token = NULL;
 	gchar* oauth_token_secret = NULL;
 	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	GHashTable* _tmp2_;
+	GHashTable* _tmp3_;
 	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
+	gchar* _tmp5_;
+	GHashTable* _tmp6_;
 	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp8_;
 	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
+	const gchar* _tmp10_;
+	const gchar* _tmp16_;
+	const gchar* _tmp17_;
 #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2750,22 +2752,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
 	if (_tmp10_ == NULL) {
 #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp9_ = TRUE;
-#line 2739 "FlickrPublishingAuthenticator.c"
+#line 2741 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp11_;
 #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp11_ = oauth_token_secret;
 #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp9_ = _tmp11_ == NULL;
-#line 2746 "FlickrPublishingAuthenticator.c"
+#line 2748 "FlickrPublishingAuthenticator.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp9_) {
-#line 2750 "FlickrPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
+#line 2752 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp12_;
+		const gchar* _tmp13_;
+		GError* _tmp14_;
+		GError* _tmp15_;
 #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp12_ = self->priv->host;
 #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2778,7 +2780,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
 		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
 #line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (_tmp15_);
-#line 2767 "FlickrPublishingAuthenticator.c"
+#line 2769 "FlickrPublishingAuthenticator.c"
 	}
 #line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp16_ = oauth_token;
@@ -2792,17 +2794,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
 	_g_free0 (oauth_token_secret);
 #line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token);
-#line 2781 "FlickrPublishingAuthenticator.c"
+#line 2783 "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_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
 #line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2828,7 +2830,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_to
 	_tmp5_ = token;
 #line 422 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (self, _tmp5_);
-#line 2816 "FlickrPublishingAuthenticator.c"
+#line 2818 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2840,21 +2842,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_system_browser_la
 ".");
 #line 428 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (self);
-#line 2827 "FlickrPublishingAuthenticator.c"
+#line 2829 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed (PublishingAuthenticatorShotwellFlickrPinEntryPane* _sender, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) {
 #line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, sender, authorization_pin);
-#line 2834 "FlickrPublishingAuthenticator.c"
+#line 2836 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_;
+	guint _tmp1_;
+	const gchar* _tmp2_;
 #line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2874,18 +2876,18 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed
 	_tmp2_ = pin;
 #line 436 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (self, _tmp2_);
-#line 2860 "FlickrPublishingAuthenticator.c"
+#line 2862 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
 	gchar* login_uri = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -2910,11 +2912,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
 #line 443 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_debug ("FlickrPublishingAuthenticator.vala:443: ACTION: launching system brows" \
 "er with uri = '%s'", _tmp5_);
-#line 2895 "FlickrPublishingAuthenticator.c"
+#line 2897 "FlickrPublishingAuthenticator.c"
 	{
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
 #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp6_ = login_uri;
 #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2929,7 +2931,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 2914 "FlickrPublishingAuthenticator.c"
+#line 2916 "FlickrPublishingAuthenticator.c"
 				goto __catch2_g_spawn_error;
 			}
 #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2940,16 +2942,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
 			g_clear_error (&_inner_error_);
 #line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 2925 "FlickrPublishingAuthenticator.c"
+#line 2927 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally2;
 	__catch2_g_spawn_error:
 	{
 		GError* e = NULL;
-		SpitPublishingPluginHost* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
+		SpitPublishingPluginHost* _tmp9_;
+		GError* _tmp10_;
+		GError* _tmp11_;
 #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		e = _inner_error_;
 #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2970,7 +2972,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
 		_g_free0 (login_uri);
 #line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 2955 "FlickrPublishingAuthenticator.c"
+#line 2957 "FlickrPublishingAuthenticator.c"
 	}
 	__finally2:
 #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -2983,25 +2985,25 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_bro
 		g_clear_error (&_inner_error_);
 #line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 2968 "FlickrPublishingAuthenticator.c"
+#line 2970 "FlickrPublishingAuthenticator.c"
 	}
 #line 453 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (self);
 #line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (login_uri);
-#line 2974 "FlickrPublishingAuthenticator.c"
+#line 2976 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
 	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 	PublishingAuthenticatorShotwellFlickrPinEntryPane* pin_entry_pane = NULL;
-	GtkBuilder* _tmp8_ = NULL;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_ = NULL;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp10_ = NULL;
-	SpitPublishingPluginHost* _tmp11_ = NULL;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp12_ = NULL;
+	GtkBuilder* _tmp7_;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp8_;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_;
+	SpitPublishingPluginHost* _tmp10_;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -3011,16 +3013,16 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
 	_tmp0_ = gtk_builder_new ();
 #line 459 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	builder = _tmp0_;
-#line 2996 "FlickrPublishingAuthenticator.c"
+#line 2998 "FlickrPublishingAuthenticator.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp1_;
 #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp1_ = builder;
 #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
 #line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3005 "FlickrPublishingAuthenticator.c"
+#line 3007 "FlickrPublishingAuthenticator.c"
 			goto __catch3_g_error;
 		}
 	}
@@ -3028,12 +3030,11 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
 	__catch3_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp2_;
+		const gchar* _tmp3_;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
+		GError* _tmp6_;
 #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		e = _inner_error_;
 #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3048,23 +3049,21 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
 #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp4_ = self->priv->host;
 #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue.");
+		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
+"n’t continue."));
 #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_);
 #line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp7_);
+		_g_error_free0 (_tmp6_);
 #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (e);
 #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_object_unref0 (builder);
 #line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 3047 "FlickrPublishingAuthenticator.c"
+#line 3046 "FlickrPublishingAuthenticator.c"
 	}
 	__finally3:
 #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3077,55 +3076,54 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pa
 		g_clear_error (&_inner_error_);
 #line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 3060 "FlickrPublishingAuthenticator.c"
+#line 3059 "FlickrPublishingAuthenticator.c"
 	}
 #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = builder;
+	_tmp7_ = builder;
 #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp8_);
+	_tmp8_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp7_);
 #line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	pin_entry_pane = _tmp9_;
+	pin_entry_pane = _tmp8_;
 #line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = pin_entry_pane;
+	_tmp9_ = pin_entry_pane;
 #line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0);
+	g_signal_connect_object (_tmp9_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0);
 #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = self->priv->host;
+	_tmp10_ = self->priv->host;
 #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = pin_entry_pane;
+	_tmp11_ = pin_entry_pane;
 #line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_object_unref0 (pin_entry_pane);
 #line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_object_unref0 (builder);
-#line 3082 "FlickrPublishingAuthenticator.c"
+#line 3081 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 3089 "FlickrPublishingAuthenticator.c"
+#line 3088 "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) {
 #line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 3096 "FlickrPublishingAuthenticator.c"
+#line 3095 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) {
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
@@ -3143,22 +3141,20 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 #line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = self->priv->host;
 #line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = _ ("Verifying authorization…");
-#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = self->priv->session;
+	_tmp3_ = self->priv->session;
 #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = pin;
+	_tmp4_ = pin;
 #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
+	_tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_);
 #line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	txn = _tmp6_;
+	txn = _tmp5_;
 #line 484 "/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 485 "/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 3140 "FlickrPublishingAuthenticator.c"
+#line 3136 "FlickrPublishingAuthenticator.c"
 	{
 #line 488 "/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_);
@@ -3166,7 +3162,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3148 "FlickrPublishingAuthenticator.c"
+#line 3144 "FlickrPublishingAuthenticator.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
 #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3177,28 +3173,28 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 			g_clear_error (&_inner_error_);
 #line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 3159 "FlickrPublishingAuthenticator.c"
+#line 3155 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally4;
 	__catch4_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp6_;
+		GError* _tmp7_;
 #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		err = _inner_error_;
 #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_inner_error_ = NULL;
 #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = self->priv->host;
+		_tmp6_ = self->priv->host;
 #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp8_ = err;
+		_tmp7_ = err;
 #line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
 #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 3180 "FlickrPublishingAuthenticator.c"
+#line 3176 "FlickrPublishingAuthenticator.c"
 	}
 	__finally4:
 #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3211,22 +3207,22 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 		g_clear_error (&_inner_error_);
 #line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 3193 "FlickrPublishingAuthenticator.c"
+#line 3189 "FlickrPublishingAuthenticator.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3197 "FlickrPublishingAuthenticator.c"
+#line 3193 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3256,17 +3252,17 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
 	publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_);
 #line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp6_);
-#line 3237 "FlickrPublishingAuthenticator.c"
+#line 3233 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GError* _tmp5_;
 #line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3294,33 +3290,33 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
 	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 511 "/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 3274 "FlickrPublishingAuthenticator.c"
+#line 3270 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* token = NULL;
 	gchar* token_secret = NULL;
 	gchar* username = NULL;
 	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	GHashTable* _tmp2_;
+	GHashTable* _tmp3_;
 	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
+	gchar* _tmp5_;
+	GHashTable* _tmp6_;
 	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GHashTable* _tmp9_ = NULL;
+	gchar* _tmp8_;
+	GHashTable* _tmp9_;
 	gconstpointer _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	const gchar* _tmp14_;
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp17_ = NULL;
+	const gchar* _tmp17_;
 #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3387,34 +3383,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 	if (_tmp17_ == NULL) {
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp16_ = TRUE;
-#line 3365 "FlickrPublishingAuthenticator.c"
+#line 3361 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp18_ = NULL;
+		const gchar* _tmp18_;
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp18_ = token_secret;
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp16_ = _tmp18_ == NULL;
-#line 3372 "FlickrPublishingAuthenticator.c"
+#line 3368 "FlickrPublishingAuthenticator.c"
 	}
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp16_) {
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp15_ = TRUE;
-#line 3378 "FlickrPublishingAuthenticator.c"
+#line 3374 "FlickrPublishingAuthenticator.c"
 	} else {
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp19_ = username;
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp15_ = _tmp19_ == NULL;
-#line 3385 "FlickrPublishingAuthenticator.c"
+#line 3381 "FlickrPublishingAuthenticator.c"
 	}
 #line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp15_) {
-#line 3389 "FlickrPublishingAuthenticator.c"
-		SpitPublishingPluginHost* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		GError* _tmp22_ = NULL;
+#line 3385 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp20_;
+		GError* _tmp21_;
+		GError* _tmp22_;
 #line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp20_ = self->priv->host;
 #line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3428,12 +3424,12 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 		_g_error_free0 (_tmp22_);
 #line 533 "/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 3405 "FlickrPublishingAuthenticator.c"
+#line 3401 "FlickrPublishingAuthenticator.c"
 	} else {
-		PublishingAuthenticatorShotwellFlickrSession* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
+		PublishingAuthenticatorShotwellFlickrSession* _tmp23_;
+		const gchar* _tmp24_;
+		const gchar* _tmp25_;
+		const gchar* _tmp26_;
 #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp23_ = self->priv->session;
 #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3444,7 +3440,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 		_tmp26_ = username;
 #line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 3421 "FlickrPublishingAuthenticator.c"
+#line 3417 "FlickrPublishingAuthenticator.c"
 	}
 #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (data);
@@ -3454,59 +3450,59 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 	_g_free0 (token_secret);
 #line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token);
-#line 3431 "FlickrPublishingAuthenticator.c"
+#line 3427 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GVariant* _variant_new3 (gchar* value) {
 #line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3438 "FlickrPublishingAuthenticator.c"
+#line 3434 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GVariant* _variant_new4 (gchar* value) {
 #line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3445 "FlickrPublishingAuthenticator.c"
+#line 3441 "FlickrPublishingAuthenticator.c"
 }
 
 
 static GVariant* _variant_new5 (gchar* value) {
 #line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3452 "FlickrPublishingAuthenticator.c"
+#line 3448 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	GHashTable* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	GVariant* _tmp11_ = NULL;
-	GHashTable* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	GVariant* _tmp17_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
+	GHashTable* _tmp0_;
+	gchar* _tmp1_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GVariant* _tmp5_;
+	GHashTable* _tmp6_;
+	gchar* _tmp7_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	GVariant* _tmp11_;
+	GHashTable* _tmp12_;
+	gchar* _tmp13_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GVariant* _tmp17_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
 #line 539 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
 #line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3589,7 +3585,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_session_authentic
 	_g_free0 (_tmp26_);
 #line 549 "/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), "authenticated");
-#line 3566 "FlickrPublishingAuthenticator.c"
+#line 3562 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3600,7 +3596,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_class_init (Publishi
 	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrFlickrPrivate));
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_flickr_finalize;
-#line 3577 "FlickrPublishingAuthenticator.c"
+#line 3573 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3608,30 +3604,30 @@ static void publishing_authenticator_shotwell_flickr_flickr_spit_publishing_auth
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
+	iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
+	iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter;
+	iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter;
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
+	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
-#line 3594 "FlickrPublishingAuthenticator.c"
+	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
+#line 3590 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) {
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE (self);
-#line 3601 "FlickrPublishingAuthenticator.c"
+#line 3597 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj) {
+static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject * obj) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+	guint _tmp1_;
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
 #line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
@@ -3648,7 +3644,7 @@ static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* o
 	_g_object_unref0 (self->priv->host);
 #line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_flickr_parent_class)->finalize (obj);
-#line 3625 "FlickrPublishingAuthenticator.c"
+#line 3621 "FlickrPublishingAuthenticator.c"
 }
 
 
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 400d4f1..b531dd6 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1,4 +1,4 @@
-/* GoogleAuthenticator.c generated by valac 0.34.7, the Vala compiler
+/* GoogleAuthenticator.c generated by valac 0.36.6, the Vala compiler
  * generated from GoogleAuthenticator.vala, do not modify */
 
 
@@ -26,6 +26,11 @@ typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass
 typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate;
 #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
+};
+static guint publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {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))
@@ -166,7 +171,7 @@ static gpointer publishing_authenticator_shotwell_google_get_access_tokens_trans
 static gpointer publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_google_google_parent_class = NULL;
-static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = NULL;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.c" \
 "om"
@@ -179,7 +184,7 @@ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authentic
 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);
+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
@@ -188,7 +193,7 @@ static gboolean publishing_authenticator_shotwell_google_session_real_is_authent
 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);
+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
@@ -252,12 +257,12 @@ 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);
 static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
-static void publishing_authenticator_shotwell_google_google_finalize (GObject* obj);
+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 * self = NULL;
-	const gchar* _tmp0_ = 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"
@@ -266,68 +271,68 @@ PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authentic
 	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 269 "GoogleAuthenticator.c"
+#line 274 "GoogleAuthenticator.c"
 }
 
 
 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 276 "GoogleAuthenticator.c"
+#line 281 "GoogleAuthenticator.c"
 }
 
 
 gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty;
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	result = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 289 "GoogleAuthenticator.c"
+#line 294 "GoogleAuthenticator.c"
 }
 
 
 static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 316 "GoogleAuthenticator.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 321 "GoogleAuthenticator.c"
+		gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 324 "GoogleAuthenticator.c"
+#line 329 "GoogleAuthenticator.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 330 "GoogleAuthenticator.c"
+#line 335 "GoogleAuthenticator.c"
 	}
 }
 
@@ -335,43 +340,43 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 354 "GoogleAuthenticator.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 359 "GoogleAuthenticator.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 362 "GoogleAuthenticator.c"
+#line 367 "GoogleAuthenticator.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 374 "GoogleAuthenticator.c"
+#line 379 "GoogleAuthenticator.c"
 	}
 }
 
@@ -380,136 +385,136 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	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"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 398 "GoogleAuthenticator.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 403 "GoogleAuthenticator.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 404 "GoogleAuthenticator.c"
+#line 409 "GoogleAuthenticator.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 408 "GoogleAuthenticator.c"
+#line 413 "GoogleAuthenticator.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 412 "GoogleAuthenticator.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 424 "GoogleAuthenticator.c"
+#line 429 "GoogleAuthenticator.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 434 "GoogleAuthenticator.c"
+#line 439 "GoogleAuthenticator.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 440 "GoogleAuthenticator.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#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 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 454 "GoogleAuthenticator.c"
+#line 459 "GoogleAuthenticator.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 464 "GoogleAuthenticator.c"
+#line 469 "GoogleAuthenticator.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 470 "GoogleAuthenticator.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 475 "GoogleAuthenticator.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 479 "GoogleAuthenticator.c"
+#line 484 "GoogleAuthenticator.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 499 "GoogleAuthenticator.c"
+#line 504 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
 	gchar* page_title = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
+	const gchar* _tmp2_;
+	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"
@@ -532,16 +537,16 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
 	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp6_ > 0) {
-#line 535 "GoogleAuthenticator.c"
+#line 540 "GoogleAuthenticator.c"
 		gint auth_code_field_start = 0;
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
+		const gchar* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gchar* auth_code = NULL;
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = 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;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -556,7 +561,7 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
 			_g_free0 (page_title);
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 559 "GoogleAuthenticator.c"
+#line 564 "GoogleAuthenticator.c"
 		}
 #line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp10_ = page_title;
@@ -571,14 +576,14 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_rea
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp13_ = auth_code;
 #line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		g_signal_emit_by_name (self, "authorized", _tmp13_);
+		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp13_);
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (auth_code);
-#line 577 "GoogleAuthenticator.c"
+#line 582 "GoogleAuthenticator.c"
 	}
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (page_title);
-#line 581 "GoogleAuthenticator.c"
+#line 586 "GoogleAuthenticator.c"
 }
 
 
@@ -586,12 +591,12 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla
 #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"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	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 594 "GoogleAuthenticator.c"
+	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"
 }
 
 
@@ -599,13 +604,13 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_ins
 }
 
 
-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 608 "GoogleAuthenticator.c"
+#line 613 "GoogleAuthenticator.c"
 }
 
 
@@ -624,7 +629,7 @@ GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type
 static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base) {
 	PublishingAuthenticatorShotwellGoogleSession * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
 #line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -633,7 +638,7 @@ 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 636 "GoogleAuthenticator.c"
+#line 641 "GoogleAuthenticator.c"
 }
 
 
@@ -650,7 +655,7 @@ 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 653 "GoogleAuthenticator.c"
+#line 658 "GoogleAuthenticator.c"
 }
 
 
@@ -660,14 +665,14 @@ PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_
 	self = (PublishingAuthenticatorShotwellGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 663 "GoogleAuthenticator.c"
+#line 668 "GoogleAuthenticator.c"
 }
 
 
 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 670 "GoogleAuthenticator.c"
+#line 675 "GoogleAuthenticator.c"
 }
 
 
@@ -677,8 +682,8 @@ static void publishing_authenticator_shotwell_google_session_class_init (Publish
 #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 681 "GoogleAuthenticator.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
+#line 686 "GoogleAuthenticator.c"
 }
 
 
@@ -689,11 +694,11 @@ static void publishing_authenticator_shotwell_google_session_instance_init (Publ
 	self->refresh_token = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->expires_at = (gint64) -1;
-#line 692 "GoogleAuthenticator.c"
+#line 697 "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);
@@ -703,7 +708,7 @@ 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 706 "GoogleAuthenticator.c"
+#line 711 "GoogleAuthenticator.c"
 }
 
 
@@ -721,8 +726,8 @@ 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* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = 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"
@@ -745,21 +750,21 @@ 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 748 "GoogleAuthenticator.c"
+#line 753 "GoogleAuthenticator.c"
 }
 
 
 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 755 "GoogleAuthenticator.c"
+#line 760 "GoogleAuthenticator.c"
 }
 
 
 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 762 "GoogleAuthenticator.c"
+#line 767 "GoogleAuthenticator.c"
 }
 
 
@@ -781,9 +786,9 @@ 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* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	const gchar* _tmp2_;
 #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"
@@ -804,21 +809,21 @@ PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_a
 	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 807 "GoogleAuthenticator.c"
+#line 812 "GoogleAuthenticator.c"
 }
 
 
 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 814 "GoogleAuthenticator.c"
+#line 819 "GoogleAuthenticator.c"
 }
 
 
 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 821 "GoogleAuthenticator.c"
+#line 826 "GoogleAuthenticator.c"
 }
 
 
@@ -840,11 +845,11 @@ GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_
 
 PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
 	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* self = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #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"
@@ -865,21 +870,21 @@ PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authen
 	_g_free0 (_tmp4_);
 #line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 868 "GoogleAuthenticator.c"
+#line 873 "GoogleAuthenticator.c"
 }
 
 
 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 875 "GoogleAuthenticator.c"
+#line 880 "GoogleAuthenticator.c"
 }
 
 
 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 882 "GoogleAuthenticator.c"
+#line 887 "GoogleAuthenticator.c"
 }
 
 
@@ -902,36 +907,36 @@ GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_ty
 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 905 "GoogleAuthenticator.c"
+#line 910 "GoogleAuthenticator.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 912 "GoogleAuthenticator.c"
+#line 917 "GoogleAuthenticator.c"
 }
 
 
 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 919 "GoogleAuthenticator.c"
+#line 924 "GoogleAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
 	PublishingAuthenticatorShotwellGoogleGoogle * self = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	GHashFunc _tmp2_ = NULL;
-	GEqualFunc _tmp3_ = NULL;
-	GHashTable* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	GHashFunc _tmp2_;
+	GEqualFunc _tmp3_;
+	GHashTable* _tmp4_;
+	const gchar* _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"
@@ -982,25 +987,25 @@ PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_g
 	self->priv->welcome_message = _tmp9_;
 #line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 985 "GoogleAuthenticator.c"
+#line 990 "GoogleAuthenticator.c"
 }
 
 
 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 992 "GoogleAuthenticator.c"
+#line 997 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	gchar* refresh_token = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp6_ = 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"
@@ -1013,22 +1018,22 @@ 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 1016 "GoogleAuthenticator.c"
-		const gchar* _tmp4_ = NULL;
+#line 1021 "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 1022 "GoogleAuthenticator.c"
+#line 1027 "GoogleAuthenticator.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = FALSE;
-#line 1026 "GoogleAuthenticator.c"
+#line 1031 "GoogleAuthenticator.c"
 	}
 #line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp2_) {
-#line 1030 "GoogleAuthenticator.c"
-		const gchar* _tmp5_ = NULL;
+#line 1035 "GoogleAuthenticator.c"
+		const gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = refresh_token;
 #line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1039,16 +1044,15 @@ 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 1042 "GoogleAuthenticator.c"
+#line 1047 "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 1048 "GoogleAuthenticator.c"
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		SpitPublishingPluginHost* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+#line 1053 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp7_;
+		SpitPublishingPluginHost* _tmp8_;
 #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp7_ = self->priv->host;
 #line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1056,22 +1060,20 @@ static void publishing_authenticator_shotwell_google_google_real_authenticate (S
 #line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp8_ = self->priv->host;
 #line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = _ ("You have already logged in and out of a Google service during this Sho" \
+		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _ ("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.");
-#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _tmp9_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1062 "GoogleAuthenticator.c"
+"then try publishing again."), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1064 "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 1066 "GoogleAuthenticator.c"
+#line 1068 "GoogleAuthenticator.c"
 	}
 #line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (refresh_token);
-#line 1070 "GoogleAuthenticator.c"
+#line 1072 "GoogleAuthenticator.c"
 }
 
 
@@ -1084,22 +1086,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 1083 "GoogleAuthenticator.c"
+#line 1085 "GoogleAuthenticator.c"
 }
 
 
 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 1090 "GoogleAuthenticator.c"
+#line 1092 "GoogleAuthenticator.c"
 }
 
 
 static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	GHashTable* result = NULL;
-	GHashTable* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
 #line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
 #line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1110,14 +1112,14 @@ 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 1109 "GoogleAuthenticator.c"
+#line 1111 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base) {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
 #line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1128,7 +1130,7 @@ 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 1127 "GoogleAuthenticator.c"
+#line 1129 "GoogleAuthenticator.c"
 }
 
 
@@ -1136,50 +1138,50 @@ static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPu
 	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 1135 "GoogleAuthenticator.c"
+#line 1137 "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) {
 #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 1142 "GoogleAuthenticator.c"
+#line 1144 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self) {
 	gchar* user_authorization_url = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp27_ = NULL;
-	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_ = NULL;
-	SpitPublishingPluginHost* _tmp29_ = NULL;
-	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp27_;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_;
+	SpitPublishingPluginHost* _tmp29_;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_;
 #line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1283,16 +1285,16 @@ 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 1281 "GoogleAuthenticator.c"
+#line 1283 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
-	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	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"
@@ -1314,30 +1316,30 @@ static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_aut
 	_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 1311 "GoogleAuthenticator.c"
+#line 1313 "GoogleAuthenticator.c"
 }
 
 
 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 1318 "GoogleAuthenticator.c"
+#line 1320 "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) {
 #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 1325 "GoogleAuthenticator.c"
+#line 1327 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* tokens_txn = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_;
 	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));
@@ -1362,7 +1364,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 	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 1358 "GoogleAuthenticator.c"
+#line 1360 "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_);
@@ -1370,7 +1372,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 1366 "GoogleAuthenticator.c"
+#line 1368 "GoogleAuthenticator.c"
 				goto __catch5_spit_publishing_publishing_error;
 			}
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1381,15 +1383,15 @@ 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 1377 "GoogleAuthenticator.c"
+#line 1379 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally5;
 	__catch5_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #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"
@@ -1402,7 +1404,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1398 "GoogleAuthenticator.c"
+#line 1400 "GoogleAuthenticator.c"
 	}
 	__finally5:
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1415,22 +1417,22 @@ 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 1411 "GoogleAuthenticator.c"
+#line 1413 "GoogleAuthenticator.c"
 	}
 #line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1415 "GoogleAuthenticator.c"
+#line 1417 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #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"
@@ -1460,20 +1462,20 @@ static void publishing_authenticator_shotwell_google_google_on_get_access_tokens
 	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp6_);
 #line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp6_);
-#line 1455 "GoogleAuthenticator.c"
+#line 1457 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #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"
@@ -1507,34 +1509,34 @@ static void publishing_authenticator_shotwell_google_google_on_get_access_tokens
 	_tmp8_ = err;
 #line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1501 "GoogleAuthenticator.c"
+#line 1503 "GoogleAuthenticator.c"
 }
 
 
 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 1508 "GoogleAuthenticator.c"
+#line 1510 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
 	JsonParser* parser = NULL;
-	JsonParser* _tmp0_ = NULL;
+	JsonParser* _tmp0_;
 	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_ = NULL;
-	JsonNode* _tmp11_ = NULL;
-	JsonObject* _tmp12_ = NULL;
-	JsonObject* _tmp13_ = NULL;
+	JsonParser* _tmp10_;
+	JsonNode* _tmp11_;
+	JsonObject* _tmp12_;
+	JsonObject* _tmp13_;
 	gboolean _tmp14_ = FALSE;
-	JsonObject* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	JsonObject* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	JsonObject* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	JsonObject* _tmp36_ = NULL;
-	gboolean _tmp37_ = FALSE;
+	JsonObject* _tmp15_;
+	gboolean _tmp16_;
+	JsonObject* _tmp22_;
+	gboolean _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));
@@ -1547,10 +1549,10 @@ 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 1540 "GoogleAuthenticator.c"
+#line 1542 "GoogleAuthenticator.c"
 	{
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		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"
@@ -1559,7 +1561,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1552 "GoogleAuthenticator.c"
+#line 1554 "GoogleAuthenticator.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -1567,13 +1569,13 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	__catch6_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _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"
@@ -1604,7 +1606,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		_g_object_unref0 (parser);
 #line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1597 "GoogleAuthenticator.c"
+#line 1599 "GoogleAuthenticator.c"
 	}
 	__finally6:
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1617,7 +1619,7 @@ 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 1610 "GoogleAuthenticator.c"
+#line 1612 "GoogleAuthenticator.c"
 	}
 #line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp10_ = parser;
@@ -1635,27 +1637,27 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (!_tmp16_) {
-#line 1628 "GoogleAuthenticator.c"
-		JsonObject* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
+#line 1630 "GoogleAuthenticator.c"
+		JsonObject* _tmp17_;
+		gboolean _tmp18_;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp17_ = response_obj;
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp14_ = !_tmp18_;
-#line 1637 "GoogleAuthenticator.c"
+#line 1639 "GoogleAuthenticator.c"
 	} else {
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp14_ = FALSE;
-#line 1641 "GoogleAuthenticator.c"
+#line 1643 "GoogleAuthenticator.c"
 	}
 #line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp14_) {
-#line 1645 "GoogleAuthenticator.c"
-		SpitPublishingPluginHost* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
+#line 1647 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp19_;
+		GError* _tmp20_;
+		GError* _tmp21_;
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp19_ = self->priv->host;
 #line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1672,7 +1674,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		_g_object_unref0 (parser);
 #line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1665 "GoogleAuthenticator.c"
+#line 1667 "GoogleAuthenticator.c"
 	}
 #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp22_ = response_obj;
@@ -1680,14 +1682,14 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	_tmp23_ = json_object_has_member (_tmp22_, "expires_in");
 #line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp23_) {
-#line 1673 "GoogleAuthenticator.c"
+#line 1675 "GoogleAuthenticator.c"
 		gint64 duration = 0LL;
-		JsonObject* _tmp24_ = NULL;
-		gint64 _tmp25_ = 0LL;
+		JsonObject* _tmp24_;
+		gint64 _tmp25_;
 		gint64 abs_time = 0LL;
-		gint64 _tmp26_ = 0LL;
-		gint64 _tmp27_ = 0LL;
-		gint64 _tmp28_ = 0LL;
+		gint64 _tmp26_;
+		gint64 _tmp27_;
+		gint64 _tmp28_;
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp24_ = response_obj;
 #line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1704,7 +1706,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		_tmp28_ = 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 1697 "GoogleAuthenticator.c"
+#line 1699 "GoogleAuthenticator.c"
 	}
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp29_ = response_obj;
@@ -1712,12 +1714,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	_tmp30_ = json_object_has_member (_tmp29_, "refresh_token");
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp30_) {
-#line 1705 "GoogleAuthenticator.c"
+#line 1707 "GoogleAuthenticator.c"
 		gchar* refresh_token = NULL;
-		JsonObject* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
+		JsonObject* _tmp31_;
+		const gchar* _tmp32_;
+		gchar* _tmp33_;
+		const gchar* _tmp34_;
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp31_ = response_obj;
 #line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1730,17 +1732,17 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		_tmp34_ = refresh_token;
 #line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 1723 "GoogleAuthenticator.c"
-			const gchar* _tmp35_ = NULL;
+#line 1725 "GoogleAuthenticator.c"
+			const gchar* _tmp35_;
 #line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp35_ = 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 1729 "GoogleAuthenticator.c"
+#line 1731 "GoogleAuthenticator.c"
 		}
 #line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (refresh_token);
-#line 1733 "GoogleAuthenticator.c"
+#line 1735 "GoogleAuthenticator.c"
 	}
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp36_ = response_obj;
@@ -1748,12 +1750,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 	_tmp37_ = json_object_has_member (_tmp36_, "access_token");
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp37_) {
-#line 1741 "GoogleAuthenticator.c"
+#line 1743 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
-		JsonObject* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
+		JsonObject* _tmp38_;
+		const gchar* _tmp39_;
+		gchar* _tmp40_;
+		const gchar* _tmp41_;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp38_ = response_obj;
 #line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1766,35 +1768,35 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		_tmp41_ = access_token;
 #line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp41_, "") != 0) {
-#line 1759 "GoogleAuthenticator.c"
-			const gchar* _tmp42_ = NULL;
+#line 1761 "GoogleAuthenticator.c"
+			const gchar* _tmp42_;
 #line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp42_ = 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 1765 "GoogleAuthenticator.c"
+#line 1767 "GoogleAuthenticator.c"
 		}
 #line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 1769 "GoogleAuthenticator.c"
+#line 1771 "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 1775 "GoogleAuthenticator.c"
+#line 1777 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GVariant* _tmp4_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	GHashTable* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GVariant* _tmp4_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 #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"
@@ -1826,18 +1828,18 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_token_ava
 	_g_free0 (_tmp5_->refresh_token);
 #line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp5_->refresh_token = _tmp7_;
-#line 1818 "GoogleAuthenticator.c"
+#line 1820 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time) {
-	gint64 _tmp0_ = 0LL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	GHashTable* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
-	GVariant* _tmp6_ = NULL;
+	gint64 _tmp0_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	gint64 _tmp2_;
+	GHashTable* _tmp3_;
+	gchar* _tmp4_;
+	gint64 _tmp5_;
+	GVariant* _tmp6_;
 #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"
@@ -1862,19 +1864,19 @@ static void publishing_authenticator_shotwell_google_google_on_expiry_time_avila
 	g_variant_ref_sink (_tmp6_);
 #line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_hash_table_insert (_tmp3_, _tmp4_, _tmp6_);
-#line 1854 "GoogleAuthenticator.c"
+#line 1856 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GHashTable* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
+	const gchar* _tmp0_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	GVariant* _tmp7_;
 #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"
@@ -1908,30 +1910,30 @@ static void publishing_authenticator_shotwell_google_google_on_access_token_avai
 	g_hash_table_insert (_tmp4_, _tmp5_, _tmp7_);
 #line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_fetch_username (self);
-#line 1899 "GoogleAuthenticator.c"
+#line 1901 "GoogleAuthenticator.c"
 }
 
 
 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 1906 "GoogleAuthenticator.c"
+#line 1908 "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) {
 #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 1913 "GoogleAuthenticator.c"
+#line 1915 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp2_ = NULL;
-	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
+	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -1956,13 +1958,13 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 280 "/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_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 1946 "GoogleAuthenticator.c"
+#line 1948 "GoogleAuthenticator.c"
 	{
 #line 283 "/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_);
 #line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1952 "GoogleAuthenticator.c"
+#line 1954 "GoogleAuthenticator.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -1970,8 +1972,8 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 	__catch7_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1984,7 +1986,7 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1974 "GoogleAuthenticator.c"
+#line 1976 "GoogleAuthenticator.c"
 	}
 	__finally7:
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1997,22 +1999,22 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 		g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1987 "GoogleAuthenticator.c"
+#line 1989 "GoogleAuthenticator.c"
 	}
 #line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 1991 "GoogleAuthenticator.c"
+#line 1993 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #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"
@@ -2042,17 +2044,17 @@ static void publishing_authenticator_shotwell_google_google_on_fetch_username_tr
 	publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp6_);
 #line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp6_);
-#line 2031 "GoogleAuthenticator.c"
+#line 2033 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GError* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GError* _tmp5_;
 #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"
@@ -2078,27 +2080,27 @@ static void publishing_authenticator_shotwell_google_google_on_fetch_username_tr
 	_tmp5_ = err;
 #line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 2066 "GoogleAuthenticator.c"
+#line 2068 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
 	JsonParser* parser = NULL;
-	JsonParser* _tmp0_ = NULL;
+	JsonParser* _tmp0_;
 	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_ = NULL;
-	JsonNode* _tmp11_ = NULL;
-	JsonObject* _tmp12_ = NULL;
-	JsonObject* _tmp13_ = NULL;
-	JsonObject* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	JsonObject* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp34_ = NULL;
-	gboolean _tmp35_ = FALSE;
-	SpitPublishingPluginHost* _tmp36_ = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
+	JsonParser* _tmp10_;
+	JsonNode* _tmp11_;
+	JsonObject* _tmp12_;
+	JsonObject* _tmp13_;
+	JsonObject* _tmp14_;
+	gboolean _tmp15_;
+	JsonObject* _tmp24_;
+	gboolean _tmp25_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp34_;
+	gboolean _tmp35_;
+	SpitPublishingPluginHost* _tmp36_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp37_;
+	const gchar* _tmp38_;
 	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));
@@ -2111,10 +2113,10 @@ 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 2098 "GoogleAuthenticator.c"
+#line 2100 "GoogleAuthenticator.c"
 	{
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		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"
@@ -2123,7 +2125,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2110 "GoogleAuthenticator.c"
+#line 2112 "GoogleAuthenticator.c"
 			goto __catch8_g_error;
 		}
 	}
@@ -2131,13 +2133,13 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	__catch8_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _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"
@@ -2168,7 +2170,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		_g_object_unref0 (parser);
 #line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2155 "GoogleAuthenticator.c"
+#line 2157 "GoogleAuthenticator.c"
 	}
 	__finally8:
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2181,7 +2183,7 @@ 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 2168 "GoogleAuthenticator.c"
+#line 2170 "GoogleAuthenticator.c"
 	}
 #line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp10_ = parser;
@@ -2199,12 +2201,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	_tmp15_ = json_object_has_member (_tmp14_, "name");
 #line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp15_) {
-#line 2186 "GoogleAuthenticator.c"
+#line 2188 "GoogleAuthenticator.c"
 		gchar* username = NULL;
-		JsonObject* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
+		JsonObject* _tmp16_;
+		const gchar* _tmp17_;
+		gchar* _tmp18_;
+		const gchar* _tmp19_;
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp16_ = response_obj;
 #line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2217,11 +2219,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		_tmp19_ = username;
 #line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 2204 "GoogleAuthenticator.c"
-			GHashTable* _tmp20_ = NULL;
-			gchar* _tmp21_ = NULL;
-			const gchar* _tmp22_ = NULL;
-			GVariant* _tmp23_ = NULL;
+#line 2206 "GoogleAuthenticator.c"
+			GHashTable* _tmp20_;
+			gchar* _tmp21_;
+			const gchar* _tmp22_;
+			GVariant* _tmp23_;
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp20_ = self->priv->params;
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2234,11 +2236,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 			g_variant_ref_sink (_tmp23_);
 #line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_hash_table_insert (_tmp20_, _tmp21_, _tmp23_);
-#line 2221 "GoogleAuthenticator.c"
+#line 2223 "GoogleAuthenticator.c"
 		}
 #line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (username);
-#line 2225 "GoogleAuthenticator.c"
+#line 2227 "GoogleAuthenticator.c"
 	}
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp24_ = response_obj;
@@ -2246,12 +2248,12 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	_tmp25_ = json_object_has_member (_tmp24_, "access_token");
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp25_) {
-#line 2233 "GoogleAuthenticator.c"
+#line 2235 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
-		JsonObject* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
+		JsonObject* _tmp26_;
+		const gchar* _tmp27_;
+		gchar* _tmp28_;
+		const gchar* _tmp29_;
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp26_ = response_obj;
 #line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2264,11 +2266,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		_tmp29_ = access_token;
 #line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp29_, "") != 0) {
-#line 2251 "GoogleAuthenticator.c"
-			GHashTable* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			GVariant* _tmp33_ = NULL;
+#line 2253 "GoogleAuthenticator.c"
+			GHashTable* _tmp30_;
+			gchar* _tmp31_;
+			const gchar* _tmp32_;
+			GVariant* _tmp33_;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp30_ = self->priv->params;
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2281,11 +2283,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 			g_variant_ref_sink (_tmp33_);
 #line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_hash_table_insert (_tmp30_, _tmp31_, _tmp33_);
-#line 2268 "GoogleAuthenticator.c"
+#line 2270 "GoogleAuthenticator.c"
 		}
 #line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 2272 "GoogleAuthenticator.c"
+#line 2274 "GoogleAuthenticator.c"
 	}
 #line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp34_ = self->priv->session;
@@ -2307,29 +2309,29 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 	_json_object_unref0 (response_obj);
 #line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (parser);
-#line 2294 "GoogleAuthenticator.c"
+#line 2296 "GoogleAuthenticator.c"
 }
 
 
 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 2301 "GoogleAuthenticator.c"
+#line 2303 "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) {
 #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 2308 "GoogleAuthenticator.c"
+#line 2310 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
-	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
+	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
@@ -2350,7 +2352,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 2336 "GoogleAuthenticator.c"
+#line 2338 "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_);
@@ -2358,7 +2360,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 2344 "GoogleAuthenticator.c"
+#line 2346 "GoogleAuthenticator.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2369,15 +2371,15 @@ 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 2355 "GoogleAuthenticator.c"
+#line 2357 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally9;
 	__catch9_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
+		SpitPublishingPluginHost* _tmp3_;
+		GError* _tmp4_;
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2390,7 +2392,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 2376 "GoogleAuthenticator.c"
+#line 2378 "GoogleAuthenticator.c"
 	}
 	__finally9:
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2403,24 +2405,24 @@ 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 2389 "GoogleAuthenticator.c"
+#line 2391 "GoogleAuthenticator.c"
 	}
 #line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2393 "GoogleAuthenticator.c"
+#line 2395 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
+	gboolean _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #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"
@@ -2448,7 +2450,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
 	if (_tmp5_) {
 #line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2433 "GoogleAuthenticator.c"
+#line 2435 "GoogleAuthenticator.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp6_ = txn;
@@ -2460,7 +2462,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
 	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp8_);
 #line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp8_);
-#line 2445 "GoogleAuthenticator.c"
+#line 2447 "GoogleAuthenticator.c"
 }
 
 
@@ -2472,7 +2474,7 @@ static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
 	result = FALSE;
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2457 "GoogleAuthenticator.c"
+#line 2459 "GoogleAuthenticator.c"
 }
 
 
@@ -2481,22 +2483,22 @@ static gboolean ____lambda4__gsource_func (gpointer self) {
 	result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
 #line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2466 "GoogleAuthenticator.c"
+#line 2468 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp4_;
+	gboolean _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	SpitPublishingPluginHost* _tmp12_ = NULL;
-	GError* _tmp13_ = NULL;
+	PublishingRESTSupportTransaction* _tmp7_;
+	guint _tmp8_;
+	SpitPublishingPluginHost* _tmp12_;
+	GError* _tmp13_;
 #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"
@@ -2524,7 +2526,7 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
 	if (_tmp5_) {
 #line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2508 "GoogleAuthenticator.c"
+#line 2510 "GoogleAuthenticator.c"
 	}
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp7_ = txn;
@@ -2534,29 +2536,29 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
 	if (_tmp8_ == ((guint) SOUP_STATUS_BAD_REQUEST)) {
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp6_ = TRUE;
-#line 2518 "GoogleAuthenticator.c"
+#line 2520 "GoogleAuthenticator.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp9_ = NULL;
-		guint _tmp10_ = 0U;
+		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 2528 "GoogleAuthenticator.c"
+#line 2530 "GoogleAuthenticator.c"
 	}
 #line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp6_) {
-#line 2532 "GoogleAuthenticator.c"
-		SpitPublishingPluginHost* _tmp11_ = NULL;
+#line 2534 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp11_;
 #line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp11_ = 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", "");
 #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 2540 "GoogleAuthenticator.c"
+#line 2542 "GoogleAuthenticator.c"
 	}
 #line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp12_ = self->priv->host;
@@ -2564,20 +2566,20 @@ static void publishing_authenticator_shotwell_google_google_on_refresh_access_to
 	_tmp13_ = err;
 #line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp12_, _tmp13_);
-#line 2548 "GoogleAuthenticator.c"
+#line 2550 "GoogleAuthenticator.c"
 }
 
 
 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 2555 "GoogleAuthenticator.c"
+#line 2557 "GoogleAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
 #line 396 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2588,7 +2590,7 @@ 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 2572 "GoogleAuthenticator.c"
+#line 2574 "GoogleAuthenticator.c"
 }
 
 
@@ -2600,7 +2602,7 @@ 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 2583 "GoogleAuthenticator.c"
+#line 2585 "GoogleAuthenticator.c"
 }
 
 
@@ -2611,7 +2613,7 @@ static void publishing_authenticator_shotwell_google_google_class_init (Publishi
 	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 2594 "GoogleAuthenticator.c"
+#line 2596 "GoogleAuthenticator.c"
 }
 
 
@@ -2619,16 +2621,16 @@ static void publishing_authenticator_shotwell_google_google_spit_publishing_auth
 #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"
-	iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_authenticate;
+	iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_authenticate;
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_can_logout;
+	iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_can_logout;
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_get_authentication_parameter;
+	iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_get_authentication_parameter;
 #line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_logout;
+	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 2611 "GoogleAuthenticator.c"
+	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_refresh;
+#line 2613 "GoogleAuthenticator.c"
 }
 
 
@@ -2647,11 +2649,11 @@ 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 2630 "GoogleAuthenticator.c"
+#line 2632 "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);
@@ -2669,7 +2671,7 @@ static void publishing_authenticator_shotwell_google_google_finalize (GObject* o
 	_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 2652 "GoogleAuthenticator.c"
+#line 2654 "GoogleAuthenticator.c"
 }
 
 
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index 248c757..2d42463 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -1,4 +1,4 @@
-/* ShotwellAuthenticatorFactory.c generated by valac 0.34.7, the Vala compiler
+/* ShotwellAuthenticatorFactory.c generated by valac 0.36.6, the Vala compiler
  * generated from ShotwellAuthenticatorFactory.vala, do not modify */
 
 
@@ -66,7 +66,7 @@ struct _PublishingAuthenticatorFactoryClass {
 static gpointer publishing_authenticator_factory_parent_class = NULL;
 static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance;
 static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance = NULL;
-static SpitPublishingAuthenticatorFactoryIface* publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
+static SpitPublishingAuthenticatorFactoryIface * publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
 
 GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
 enum  {
@@ -86,7 +86,7 @@ GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC
 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;
-static void publishing_authenticator_factory_finalize (GObject* obj);
+static void publishing_authenticator_factory_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -98,15 +98,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) {
 	PublishingAuthenticatorFactory* result = NULL;
-	PublishingAuthenticatorFactory* _tmp0_ = NULL;
-	PublishingAuthenticatorFactory* _tmp2_ = NULL;
-	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+	PublishingAuthenticatorFactory* _tmp0_;
+	PublishingAuthenticatorFactory* _tmp2_;
+	PublishingAuthenticatorFactory* _tmp3_;
 #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp0_ = publishing_authenticator_factory_instance;
 #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	if (_tmp0_ == NULL) {
 #line 109 "ShotwellAuthenticatorFactory.c"
-		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+		PublishingAuthenticatorFactory* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		_tmp1_ = publishing_authenticator_factory_new ();
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -131,7 +131,7 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 	PublishingAuthenticatorFactory * self;
 	GeeList* result = NULL;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -157,8 +157,8 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) {
 	PublishingAuthenticatorFactory * self;
 	SpitPublishingAuthenticator* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	static GQuark _tmp2_label0 = 0;
@@ -187,8 +187,8 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
 #line 188 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp4_ = NULL;
-				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_ = NULL;
+				SpitPublishingPluginHost* _tmp4_;
+				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_;
 #line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp4_ = host;
 #line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -206,8 +206,8 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
 #line 207 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp6_ = NULL;
-				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_ = NULL;
+				SpitPublishingPluginHost* _tmp6_;
+				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_;
 #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp6_ = host;
 #line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
@@ -225,63 +225,57 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
 #line 226 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				const gchar* _tmp8_ = NULL;
-				SpitPublishingPluginHost* _tmp9_ = NULL;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp10_ = NULL;
+				SpitPublishingPluginHost* _tmp8_;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_;
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp8_ = _ ("You are not currently logged into Picasa Web Albums.\n" \
+				_tmp8_ = host;
+#line 31 "/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" \
 "\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.");
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp9_ = host;
+"s account."), _tmp8_);
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp10_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _tmp8_, _tmp9_);
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 242 "ShotwellAuthenticatorFactory.c"
+#line 239 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) {
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 248 "ShotwellAuthenticatorFactory.c"
+#line 245 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				const gchar* _tmp11_ = NULL;
-				SpitPublishingPluginHost* _tmp12_ = NULL;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp13_ = NULL;
+				SpitPublishingPluginHost* _tmp10_;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_;
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp10_ = host;
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp11_ = _ ("You are not currently logged into YouTube.\n" \
+				_tmp11_ = 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.");
+"our browser to log into the YouTube site at least once."), _tmp10_);
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp12_ = host;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp13_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _tmp11_, _tmp12_);
-#line 34 "/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 (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
 #line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 264 "ShotwellAuthenticatorFactory.c"
+#line 258 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 270 "ShotwellAuthenticatorFactory.c"
+#line 264 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = NULL;
 #line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 277 "ShotwellAuthenticatorFactory.c"
+#line 271 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	}
@@ -294,14 +288,14 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GTyp
 	self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self;
-#line 290 "ShotwellAuthenticatorFactory.c"
+#line 284 "ShotwellAuthenticatorFactory.c"
 }
 
 
 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 297 "ShotwellAuthenticatorFactory.c"
+#line 291 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -310,7 +304,7 @@ static void publishing_authenticator_factory_class_init (PublishingAuthenticator
 	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 306 "ShotwellAuthenticatorFactory.c"
+#line 300 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -318,10 +312,10 @@ static void publishing_authenticator_factory_spit_publishing_authenticator_facto
 #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;
+	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 317 "ShotwellAuthenticatorFactory.c"
+	iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create;
+#line 311 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -329,13 +323,13 @@ static void publishing_authenticator_factory_instance_init (PublishingAuthentica
 }
 
 
-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 331 "ShotwellAuthenticatorFactory.c"
+#line 325 "ShotwellAuthenticatorFactory.c"
 }