New upstream version 0.25.0upstream/0.25.0

31 files changed, 12748 insertions, 11553 deletions

diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index ea543cb..382d4fe 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -15,16 +15,14 @@
 #include "shotwell-plugin-dev-1.0.h"
 #include <gee.h>
 #include <gio/gio.h>
-#include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <float.h>
 #include <math.h>
 #include <json-glib/json-glib.h>
 #include <webkit2/webkit2.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <gobject/gvaluecollector.h>
 
 #define _g_hmac_unref0(var) ((var == NULL) ? NULL : (var = (g_hmac_unref (var), NULL)))
@@ -69,6 +67,7 @@ typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransactio
 typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
 typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction;
 
@@ -98,7 +97,6 @@ typedef struct _PublishingRESTSupportXmlDocumentClass PublishingRESTSupportXmlDo
 typedef struct _PublishingRESTSupportXmlDocumentPrivate PublishingRESTSupportXmlDocumentPrivate;
 #define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecXmlDocument PublishingRESTSupportParamSpecXmlDocument;
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 
 #define PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER (publishing_rest_support_batch_uploader_get_type ())
 #define PUBLISHING_REST_SUPPORT_BATCH_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader))
@@ -146,6 +144,16 @@ typedef struct _PublishingRESTSupportGooglePublisherPrivate PublishingRESTSuppor
 typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl PublishingRESTSupportGooglePublisherGoogleSessionImpl;
 typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass PublishingRESTSupportGooglePublisherGoogleSessionImplClass;
 
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE (publishing_rest_support_google_publisher_web_authentication_pane_get_type ())
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane))
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass))
@@ -197,6 +205,7 @@ typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClas
 
 typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransaction PublishingRESTSupportGooglePublisherUsernameFetchTransaction;
 typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
 typedef struct _PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate;
 typedef struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate;
 typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate;
@@ -388,19 +397,23 @@ struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass {
 	PublishingRESTSupportGoogleSessionClass parent_class;
 };
 
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane {
+struct _ShotwellPluginsCommonWebAuthenticationPane {
 	GObject parent_instance;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate * priv;
+	ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
 };
 
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass {
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
 	GObjectClass parent_class;
+	void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
 };
 
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate {
-	WebKitWebView* webview;
-	GtkBox* pane_widget;
-	gchar* auth_sequence_start_url;
+struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane {
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
+	PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate * priv;
+};
+
+struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass {
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
 };
 
 struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransaction {
@@ -452,7 +465,6 @@ static gpointer publishing_rest_support_google_publisher_google_session_impl_par
 static gpointer publishing_rest_support_google_publisher_web_authentication_pane_parent_class = NULL;
 static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
 static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = FALSE;
-static SpitPublishingDialogPaneIface* publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_authenticated_transaction_parent_class = NULL;
@@ -483,6 +495,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
 gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
 void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
 static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj);
 GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
@@ -524,6 +537,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message);
 void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
 gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert);
 gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
 static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length);
@@ -623,6 +637,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
 GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
 static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
 static GType publishing_rest_support_google_publisher_web_authentication_pane_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisherPrivate))
 enum  {
@@ -692,20 +707,11 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token (PublishingRESTSupportGoogleSession* base);
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
 static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj);
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate))
 enum  {
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
 };
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self, WebKitLoadEvent load_event);
-static void _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
-static gboolean __lambda4_ (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static SpitPublishingDialogPaneGeometryOptions publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static GtkWidget* publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
 static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj);
 enum  {
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
@@ -771,13 +777,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 774 "RESTSupport.c"
+#line 780 "RESTSupport.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 780 "RESTSupport.c"
+#line 786 "RESTSupport.c"
 }
 
 
@@ -839,7 +845,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
 	_g_hmac_unref0 (mac);
 #line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 842 "RESTSupport.c"
+#line 848 "RESTSupport.c"
 }
 
 
@@ -847,7 +853,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
 	PublishingRESTSupportSession* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	SoupSessionAsync* _tmp2_ = NULL;
+	SoupSession* _tmp2_ = NULL;
 	SoupSession* _tmp3_ = NULL;
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportSession*) g_type_create_instance (object_type);
@@ -860,18 +866,18 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
 #line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->endpoint_url = _tmp1_;
 #line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = (SoupSessionAsync*) soup_session_async_new ();
+	_tmp2_ = soup_session_new ();
 #line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->soup_session);
 #line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->soup_session = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, soup_session_get_type (), SoupSession);
+	self->priv->soup_session = _tmp2_;
 #line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->soup_session;
 #line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 874 "RESTSupport.c"
+#line 880 "RESTSupport.c"
 }
 
 
@@ -885,7 +891,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
 	_tmp0_ = message;
 #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 888 "RESTSupport.c"
+#line 894 "RESTSupport.c"
 }
 
 
@@ -894,7 +900,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 897 "RESTSupport.c"
+#line 903 "RESTSupport.c"
 }
 
 
@@ -906,7 +912,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
 	_tmp0_ = err;
 #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 909 "RESTSupport.c"
+#line 915 "RESTSupport.c"
 }
 
 
@@ -915,7 +921,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 918 "RESTSupport.c"
+#line 924 "RESTSupport.c"
 }
 
 
@@ -924,7 +930,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 927 "RESTSupport.c"
+#line 933 "RESTSupport.c"
 }
 
 
@@ -942,7 +948,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
 	result = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 945 "RESTSupport.c"
+#line 951 "RESTSupport.c"
 }
 
 
@@ -956,7 +962,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
 	_tmp0_ = self->priv->soup_session;
 #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_session_abort (_tmp0_);
-#line 959 "RESTSupport.c"
+#line 965 "RESTSupport.c"
 }
 
 
@@ -971,14 +977,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 974 "RESTSupport.c"
+#line 980 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 981 "RESTSupport.c"
+#line 987 "RESTSupport.c"
 }
 
 
@@ -999,7 +1005,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1002 "RESTSupport.c"
+#line 1008 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -1017,14 +1023,31 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
 #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1020 "RESTSupport.c"
+#line 1026 "RESTSupport.c"
+}
+
+
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) {
+	SoupSession* _tmp0_ = NULL;
+	SoupSession* _tmp1_ = NULL;
+#line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
+#line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp0_ = self->priv->soup_session;
+#line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_object_set (_tmp0_, "ssl-use-system-ca-file", FALSE, NULL);
+#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp1_ = self->priv->soup_session;
+#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
+#line 1043 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_session_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1027 "RESTSupport.c"
+#line 1050 "RESTSupport.c"
 }
 
 
@@ -1033,7 +1056,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1036 "RESTSupport.c"
+#line 1059 "RESTSupport.c"
 	}
 }
 
@@ -1043,11 +1066,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1046 "RESTSupport.c"
+#line 1069 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1050 "RESTSupport.c"
+#line 1073 "RESTSupport.c"
 	}
 }
 
@@ -1055,37 +1078,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1058 "RESTSupport.c"
+#line 1081 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1065 "RESTSupport.c"
+#line 1088 "RESTSupport.c"
 		PublishingRESTSupportSession* object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1072 "RESTSupport.c"
+#line 1095 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1076 "RESTSupport.c"
+#line 1099 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1080 "RESTSupport.c"
+#line 1103 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1084 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1088 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
 }
 
 
@@ -1096,25 +1119,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1099 "RESTSupport.c"
+#line 1122 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1105 "RESTSupport.c"
+#line 1128 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1109 "RESTSupport.c"
+#line 1132 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1113 "RESTSupport.c"
+#line 1136 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1117 "RESTSupport.c"
+#line 1140 "RESTSupport.c"
 }
 
 
@@ -1128,7 +1151,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1131 "RESTSupport.c"
+#line 1154 "RESTSupport.c"
 }
 
 
@@ -1137,7 +1160,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1140 "RESTSupport.c"
+#line 1163 "RESTSupport.c"
 }
 
 
@@ -1157,17 +1180,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1160 "RESTSupport.c"
+#line 1183 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1164 "RESTSupport.c"
+#line 1187 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1170 "RESTSupport.c"
+#line 1193 "RESTSupport.c"
 	}
 }
 
@@ -1186,17 +1209,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1189 "RESTSupport.c"
+#line 1212 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1193 "RESTSupport.c"
+#line 1216 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1199 "RESTSupport.c"
+#line 1222 "RESTSupport.c"
 	}
 }
 
@@ -1216,7 +1239,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
 	g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1219 "RESTSupport.c"
+#line 1242 "RESTSupport.c"
 }
 
 
@@ -1231,7 +1254,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
 	self->priv->transactions_stopped = FALSE;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1234 "RESTSupport.c"
+#line 1257 "RESTSupport.c"
 }
 
 
@@ -1245,7 +1268,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
 	_g_free0 (self->priv->endpoint_url);
 #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1248 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
 }
 
 
@@ -1270,7 +1293,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1273 "RESTSupport.c"
+#line 1296 "RESTSupport.c"
 }
 
 
@@ -1283,59 +1306,59 @@ void publishing_rest_support_session_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1286 "RESTSupport.c"
+#line 1309 "RESTSupport.c"
 	}
 }
 
 
 gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self) {
 	gchar* result = NULL;
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	switch (self) {
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1297 "RESTSupport.c"
+#line 1320 "RESTSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp0_ = g_strdup ("GET");
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1306 "RESTSupport.c"
+#line 1329 "RESTSupport.c"
 		}
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1310 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = g_strdup ("PUT");
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp1_;
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1319 "RESTSupport.c"
+#line 1342 "RESTSupport.c"
 		}
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1323 "RESTSupport.c"
+#line 1346 "RESTSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = g_strdup ("POST");
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp2_;
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1332 "RESTSupport.c"
+#line 1355 "RESTSupport.c"
 		}
 		default:
 		{
-#line 95 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			g_error ("RESTSupport.vala:95: unrecognized HTTP method enumeration value");
-#line 1338 "RESTSupport.c"
+#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
+#line 1361 "RESTSupport.c"
 		}
 	}
 }
@@ -1344,46 +1367,46 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) {
 	PublishingRESTSupportHttpMethod result = 0;
 	const gchar* _tmp0_ = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (str != NULL, 0);
-#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = str;
-#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_strcmp0 (_tmp0_, "GET") == 0) {
-#line 101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
-#line 101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 1357 "RESTSupport.c"
+#line 1380 "RESTSupport.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = str;
-#line 102 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp1_, "PUT") == 0) {
-#line 103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
-#line 103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1368 "RESTSupport.c"
+#line 1391 "RESTSupport.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = str;
-#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp2_, "POST") == 0) {
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 1379 "RESTSupport.c"
+#line 1402 "RESTSupport.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = str;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				g_error ("RESTSupport.vala:107: unrecognized HTTP method name: %s", _tmp3_);
-#line 1386 "RESTSupport.c"
+#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
+#line 1409 "RESTSupport.c"
 			}
 		}
 	}
@@ -1408,38 +1431,38 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (value != NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportArgument*) g_type_create_instance (object_type);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = key;
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->key);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->key = _tmp1_;
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = value;
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->value);
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->value = _tmp3_;
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1435 "RESTSupport.c"
+#line 1458 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1442 "RESTSupport.c"
+#line 1465 "RESTSupport.c"
 }
 
 
@@ -1451,43 +1474,43 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
-#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg2), 0);
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_strcmp0;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = arg1;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = arg2;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = _tmp3_->key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp5_;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1474 "RESTSupport.c"
+#line 1497 "RESTSupport.c"
 }
 
 
 static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1483 "RESTSupport.c"
+#line 1506 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1490 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
 }
 
 
@@ -1502,70 +1525,70 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	gpointer* _tmp7_ = NULL;
 	PublishingRESTSupportArgument** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	sorted_args = _tmp0_;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = inputArray;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = inputArray_length1;
-#line 1513 "RESTSupport.c"
+#line 1536 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
 		gint _arg_collection_size_ = 0;
 		gint arg_it = 0;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection = _tmp1_;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection_length1 = _tmp1__length1;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1525 "RESTSupport.c"
+#line 1548 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp2_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp2_;
-#line 1532 "RESTSupport.c"
+#line 1555 "RESTSupport.c"
 			{
 				GeeTreeSet* _tmp3_ = NULL;
 				PublishingRESTSupportArgument* _tmp4_ = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = sorted_args;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = arg;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 1544 "RESTSupport.c"
+#line 1567 "RESTSupport.c"
 			}
 		}
 	}
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = sorted_args;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8__length1 = _tmp6_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp8__length1;
-#line 1560 "RESTSupport.c"
+#line 1583 "RESTSupport.c"
 	}
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (sorted_args);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1568 "RESTSupport.c"
+#line 1591 "RESTSupport.c"
 }
 
 
@@ -1574,229 +1597,229 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->key;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->value;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup_printf ("%s=%s", _tmp0_, _tmp1_);
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1589 "RESTSupport.c"
+#line 1612 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_argument_init (GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1596 "RESTSupport.c"
+#line 1619 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_argument_free_value (GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1605 "RESTSupport.c"
+#line 1628 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_argument_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1615 "RESTSupport.c"
+#line 1638 "RESTSupport.c"
 	} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1619 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1627 "RESTSupport.c"
+#line 1650 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1634 "RESTSupport.c"
+#line 1657 "RESTSupport.c"
 		PublishingRESTSupportArgument* object;
 		object = collect_values[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1641 "RESTSupport.c"
+#line 1664 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1645 "RESTSupport.c"
+#line 1668 "RESTSupport.c"
 		}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1649 "RESTSupport.c"
+#line 1672 "RESTSupport.c"
 	} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1653 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
 	}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1657 "RESTSupport.c"
+#line 1680 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportArgument** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1668 "RESTSupport.c"
+#line 1691 "RESTSupport.c"
 	}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1674 "RESTSupport.c"
+#line 1697 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1678 "RESTSupport.c"
+#line 1701 "RESTSupport.c"
 	} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1682 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
 	}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1686 "RESTSupport.c"
+#line 1709 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecArgument* spec;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1700 "RESTSupport.c"
+#line 1723 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_argument (const GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1709 "RESTSupport.c"
+#line 1732 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) {
 	PublishingRESTSupportArgument* old;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1729 "RESTSupport.c"
+#line 1752 "RESTSupport.c"
 	} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1733 "RESTSupport.c"
+#line 1756 "RESTSupport.c"
 	}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1739 "RESTSupport.c"
+#line 1762 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) {
 	PublishingRESTSupportArgument* old;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1758 "RESTSupport.c"
+#line 1781 "RESTSupport.c"
 	} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1762 "RESTSupport.c"
+#line 1785 "RESTSupport.c"
 	}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1768 "RESTSupport.c"
+#line 1791 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1778 "RESTSupport.c"
+#line 1801 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1785 "RESTSupport.c"
+#line 1808 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj) {
 	PublishingRESTSupportArgument * self;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->key);
-#line 114 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->value);
-#line 1799 "RESTSupport.c"
+#line 1822 "RESTSupport.c"
 }
 
 
@@ -1817,32 +1840,32 @@ GType publishing_rest_support_argument_get_type (void) {
 gpointer publishing_rest_support_argument_ref (gpointer instance) {
 	PublishingRESTSupportArgument* self;
 	self = instance;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1824 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_argument_unref (gpointer instance) {
 	PublishingRESTSupportArgument* self;
 	self = instance;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1837 "RESTSupport.c"
+#line 1860 "RESTSupport.c"
 	}
 }
 
 
 static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1845 "RESTSupport.c"
+#line 1868 "RESTSupport.c"
 }
 
 
@@ -1860,60 +1883,60 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
 	gchar* _tmp9_ = NULL;
 	SoupMessage* _tmp10_ = NULL;
 	SoupMessage* _tmp11_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent_session;
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp2_);
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = parent_session;
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = _tmp3_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = method;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = parent_session;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = soup_message_new (_tmp6_, _tmp9_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp10_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp6_);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = self->priv->message;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1909 "RESTSupport.c"
+#line 1932 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1916 "RESTSupport.c"
+#line 1939 "RESTSupport.c"
 }
 
 
@@ -1927,50 +1950,50 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	SoupMessage* _tmp7_ = NULL;
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent_session;
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = _tmp0_;
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->endpoint_url = _tmp2_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = method;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = endpoint_url;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = soup_message_new (_tmp5_, _tmp6_);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp7_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp5_);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1966 "RESTSupport.c"
+#line 1989 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1973 "RESTSupport.c"
+#line 1996 "RESTSupport.c"
 }
 
 
@@ -1982,36 +2005,36 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
 	SoupMessage* _tmp4_ = NULL;
 	SoupMessageBody* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (written_data != NULL);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->bytes_written;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = written_data;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->length;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->bytes_written;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->priv->message;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_->request_body;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_->length;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2007 "RESTSupport.c"
+#line 2030 "RESTSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2014 "RESTSupport.c"
+#line 2037 "RESTSupport.c"
 }
 
 
@@ -2019,40 +2042,40 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 	SoupMessage* _tmp0_ = NULL;
 	SoupMessage* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = message;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2034 "RESTSupport.c"
+#line 2057 "RESTSupport.c"
 	}
 	{
 		SoupMessage* _tmp2_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = message;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2046 "RESTSupport.c"
+#line 2069 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			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 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2055 "RESTSupport.c"
+#line 2078 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
@@ -2065,50 +2088,345 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = err;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = _tmp3_->message;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_warning ("RESTSupport.vala:183: Publishing error: %s", _tmp4_);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_warning ("RESTSupport.vala:188: Publishing error: %s", _tmp4_);
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (self);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_warning ("RESTSupport.vala:184: response validation failed. bad response = '%s'.", _tmp6_);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_warning ("RESTSupport.vala:189: response validation failed. bad response = '%s'.", _tmp6_);
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp6_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = err;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = _g_error_copy0 (_tmp7_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (self->priv->err);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->err = _tmp8_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 2096 "RESTSupport.c"
+#line 2119 "RESTSupport.c"
 	}
 	__finally0:
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2107 "RESTSupport.c"
+#line 2130 "RESTSupport.c"
 	}
 }
 
 
+static gpointer _g_object_ref0 (gpointer self) {
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 2138 "RESTSupport.c"
+}
+
+
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert) {
+	GTlsCertificate* _vala_cert = NULL;
+	gchar* result = NULL;
+	GTlsCertificateFlags tls_errors = 0;
+	SoupMessage* _tmp0_ = NULL;
+	GTlsCertificate* _tmp1_ = NULL;
+	GTlsCertificateFlags _tmp2_ = 0;
+	GTlsCertificate* _tmp3_ = NULL;
+	GeeArrayList* list = NULL;
+	GeeArrayList* _tmp4_ = NULL;
+	GTlsCertificateFlags _tmp5_ = 0;
+	GTlsCertificateFlags _tmp8_ = 0;
+	GTlsCertificateFlags _tmp11_ = 0;
+	GTlsCertificateFlags _tmp14_ = 0;
+	GTlsCertificateFlags _tmp17_ = 0;
+	GTlsCertificateFlags _tmp20_ = 0;
+	GTlsCertificateFlags _tmp23_ = 0;
+	GString* builder = NULL;
+	GString* _tmp26_ = NULL;
+	GeeArrayList* _tmp27_ = NULL;
+	gint _tmp28_ = 0;
+	gint _tmp29_ = 0;
+	GString* _tmp47_ = NULL;
+	const gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
+#line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp0_ = self->priv->message;
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	soup_message_get_https_status (_tmp0_, &_tmp1_, &_tmp2_);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_object_unref0 (_vala_cert);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp3_ = _g_object_ref0 (_tmp1_);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_vala_cert = _tmp3_;
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	tls_errors = _tmp2_;
+#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	list = _tmp4_;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp5_ = tls_errors;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
+#line 2189 "RESTSupport.c"
+		GeeArrayList* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp6_ = list;
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp7_ = _ ("⚫ This website presented identification that belongs to a different we" \
+"bsite.");
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
+#line 2198 "RESTSupport.c"
+	}
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp8_ = tls_errors;
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
+#line 2204 "RESTSupport.c"
+		GeeArrayList* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp9_ = list;
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp10_ = _ ("⚫ This website’s identification is too old to trust. Check the date on" \
+" your computer’s calendar.");
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
+#line 2213 "RESTSupport.c"
+	}
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp11_ = tls_errors;
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
+#line 2219 "RESTSupport.c"
+		GeeArrayList* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp12_ = list;
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp13_ = _ ("⚫ This website’s identification was not issued by a trusted organizati" \
+"on.");
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+#line 2228 "RESTSupport.c"
+	}
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp14_ = tls_errors;
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
+#line 2234 "RESTSupport.c"
+		GeeArrayList* _tmp15_ = NULL;
+		const gchar* _tmp16_ = NULL;
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp15_ = list;
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp16_ = _ ("⚫ This website’s identification could not be processed. It may be corr" \
+"upted.");
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
+#line 2243 "RESTSupport.c"
+	}
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp17_ = tls_errors;
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
+#line 2249 "RESTSupport.c"
+		GeeArrayList* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp18_ = list;
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp19_ = _ ("⚫ This website’s identification has been revoked by the trusted organi" \
+"zation that issued it.");
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
+#line 2258 "RESTSupport.c"
+	}
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp20_ = tls_errors;
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
+#line 2264 "RESTSupport.c"
+		GeeArrayList* _tmp21_ = NULL;
+		const gchar* _tmp22_ = NULL;
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp21_ = list;
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp22_ = _ ("⚫ This website’s identification cannot be trusted because it uses very" \
+" weak encryption.");
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
+#line 2273 "RESTSupport.c"
+	}
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp23_ = tls_errors;
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
+#line 2279 "RESTSupport.c"
+		GeeArrayList* _tmp24_ = NULL;
+		const gchar* _tmp25_ = NULL;
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp24_ = list;
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp25_ = _ ("⚫ This website’s identification is only valid for future dates. Check " \
+"the date on your computer’s calendar.");
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
+#line 2288 "RESTSupport.c"
+	}
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp26_ = g_string_new ("");
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	builder = _tmp26_;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp27_ = list;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp29_ = _tmp28_;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (_tmp29_ == 1) {
+#line 2302 "RESTSupport.c"
+		GString* _tmp30_ = NULL;
+		GeeArrayList* _tmp31_ = NULL;
+		gpointer _tmp32_ = NULL;
+		gchar* _tmp33_ = NULL;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp30_ = builder;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp31_ = list;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp33_ = (gchar*) _tmp32_;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_string_append (_tmp30_, _tmp33_);
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_g_free0 (_tmp33_);
+#line 2319 "RESTSupport.c"
+	} else {
+		{
+			GeeArrayList* _entry_list = NULL;
+			GeeArrayList* _tmp34_ = NULL;
+			GeeArrayList* _tmp35_ = NULL;
+			gint _entry_size = 0;
+			GeeArrayList* _tmp36_ = NULL;
+			gint _tmp37_ = 0;
+			gint _tmp38_ = 0;
+			gint _entry_index = 0;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp34_ = list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp35_ = _g_object_ref0 (_tmp34_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_entry_list = _tmp35_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp36_ = _entry_list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp38_ = _tmp37_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_entry_size = _tmp38_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_entry_index = -1;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			while (TRUE) {
+#line 2348 "RESTSupport.c"
+				gint _tmp39_ = 0;
+				gint _tmp40_ = 0;
+				gint _tmp41_ = 0;
+				gchar* entry = NULL;
+				GeeArrayList* _tmp42_ = NULL;
+				gint _tmp43_ = 0;
+				gpointer _tmp44_ = NULL;
+				GString* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp39_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_entry_index = _tmp39_ + 1;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp40_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp41_ = _entry_size;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				if (!(_tmp40_ < _tmp41_)) {
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+					break;
+#line 2370 "RESTSupport.c"
+				}
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp42_ = _entry_list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp43_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp44_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				entry = (gchar*) _tmp44_;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp45_ = builder;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp46_ = entry;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_g_free0 (entry);
+#line 2388 "RESTSupport.c"
+			}
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_g_object_unref0 (_entry_list);
+#line 2392 "RESTSupport.c"
+		}
+	}
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp47_ = builder;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp48_ = _tmp47_->str;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp49_ = g_strdup (_tmp48_);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	result = _tmp49_;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_string_free0 (builder);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_object_unref0 (list);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (cert) {
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		*cert = _vala_cert;
+#line 2411 "RESTSupport.c"
+	} else {
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_g_object_unref0 (_vala_cert);
+#line 2415 "RESTSupport.c"
+	}
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return result;
+#line 2419 "RESTSupport.c"
+}
+
+
 void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) {
 	SoupMessage* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
@@ -2119,33 +2437,33 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 	guint8* _tmp45_ = NULL;
 	gint _tmp45__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = message;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	switch (_tmp2_) {
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_OK:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CREATED:
-#line 2138 "RESTSupport.c"
+#line 2449 "RESTSupport.c"
 		{
-#line 194 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2142 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
 		}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2148 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
 		{
 			gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
@@ -2154,46 +2472,46 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			guint _tmp7_ = 0U;
 			GError* _tmp8_ = NULL;
 			GError* _tmp9_ = NULL;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = _tmp3_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = message;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp4_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp9_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2181 "RESTSupport.c"
+#line 2492 "RESTSupport.c"
 			} else {
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2189 "RESTSupport.c"
+#line 2500 "RESTSupport.c"
 			}
 		}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2196 "RESTSupport.c"
+#line 2507 "RESTSupport.c"
 		{
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -2202,76 +2520,76 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			guint _tmp14_ = 0U;
 			GError* _tmp15_ = NULL;
 			GError* _tmp16_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = message;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp14_ = _tmp13_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp15_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp11_, _tmp14_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp16_ = _tmp15_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp11_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp16_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2229 "RESTSupport.c"
+#line 2540 "RESTSupport.c"
 			} else {
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2237 "RESTSupport.c"
+#line 2548 "RESTSupport.c"
 			}
 		}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2242 "RESTSupport.c"
+#line 2553 "RESTSupport.c"
 		{
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			GError* _tmp19_ = NULL;
 			GError* _tmp20_ = NULL;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp18_ = _tmp17_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp19_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp18_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp20_ = _tmp19_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp18_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp20_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2266 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
 			} else {
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2274 "RESTSupport.c"
+#line 2585 "RESTSupport.c"
 			}
 		}
 		default:
@@ -2279,15 +2597,15 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			SoupMessage* _tmp21_ = NULL;
 			guint _tmp22_ = 0U;
 			guint _tmp23_ = 0U;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp21_ = message;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp23_ = _tmp22_;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_tmp23_ >= ((guint) 100)) {
-#line 2290 "RESTSupport.c"
+#line 2601 "RESTSupport.c"
 				gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
 				SoupMessage* _tmp26_ = NULL;
@@ -2299,49 +2617,49 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				gchar* _tmp32_ = NULL;
 				GError* _tmp33_ = NULL;
 				GError* _tmp34_ = NULL;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp25_ = _tmp24_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp26_ = message;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp28_ = _tmp27_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp29_ = message;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp31_ = _tmp30_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp32_ = _tmp31_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp25_, _tmp28_, _tmp32_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp34_ = _tmp33_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp32_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp25_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_inner_error_ = _tmp34_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_propagate_error (error, _inner_error_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2336 "RESTSupport.c"
+#line 2647 "RESTSupport.c"
 				} else {
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2344 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
 				}
 			} else {
 				gchar* _tmp35_ = NULL;
@@ -2351,107 +2669,107 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				guint _tmp39_ = 0U;
 				GError* _tmp40_ = NULL;
 				GError* _tmp41_ = NULL;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp36_ = _tmp35_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp37_ = message;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp39_ = _tmp38_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp40_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp36_, _tmp39_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp36_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_inner_error_ = _tmp41_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_propagate_error (error, _inner_error_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2378 "RESTSupport.c"
+#line 2689 "RESTSupport.c"
 				} else {
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2386 "RESTSupport.c"
+#line 2697 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp43_ = message;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp44_ = _tmp43_->response_body;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45_ = _tmp44_->data;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45__length1 = (gint) _tmp44_->length;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp45_ == NULL) {
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = TRUE;
-#line 2403 "RESTSupport.c"
+#line 2714 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp46_ = NULL;
 		SoupMessageBody* _tmp47_ = NULL;
 		guint8* _tmp48_ = NULL;
 		gint _tmp48__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp46_ = message;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp47_ = _tmp46_->response_body;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp48_ = _tmp47_->data;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp48__length1 = (gint) _tmp47_->length;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp48__length1 == 0;
-#line 2419 "RESTSupport.c"
+#line 2730 "RESTSupport.c"
 	}
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2423 "RESTSupport.c"
+#line 2734 "RESTSupport.c"
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		GError* _tmp51_ = NULL;
 		GError* _tmp52_ = NULL;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp50_ = _tmp49_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp50_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp52_ = _tmp51_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp50_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp52_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2446 "RESTSupport.c"
+#line 2757 "RESTSupport.c"
 		} else {
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2454 "RESTSupport.c"
+#line 2765 "RESTSupport.c"
 		}
 	}
 }
@@ -2460,21 +2778,21 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 2467 "RESTSupport.c"
+#line 2778 "RESTSupport.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 2473 "RESTSupport.c"
+#line 2784 "RESTSupport.c"
 	}
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2477 "RESTSupport.c"
+#line 2788 "RESTSupport.c"
 }
 
 
@@ -2486,31 +2804,31 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportArgument** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->arguments;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->arguments_length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 2507 "RESTSupport.c"
+#line 2818 "RESTSupport.c"
 	}
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2513 "RESTSupport.c"
+#line 2824 "RESTSupport.c"
 }
 
 
@@ -2526,56 +2844,56 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
 	gint _tmp5__length1 = 0;
 	PublishingRESTSupportArgument** _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_arguments (self, &_tmp0_);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = _tmp0_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_argument_sort (_tmp2_, _tmp0_, &_tmp3_);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5__length1 = _tmp3_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp6__length1;
-#line 2553 "RESTSupport.c"
+#line 2864 "RESTSupport.c"
 	}
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp6_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2559 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
 	gboolean _tmp0_ = FALSE;
-#line 234 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = is_executed;
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = _tmp0_;
-#line 2571 "RESTSupport.c"
+#line 2882 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2578 "RESTSupport.c"
+#line 2889 "RESTSupport.c"
 }
 
 
@@ -2591,78 +2909,78 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 	GError* _tmp8_ = NULL;
 	GError* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 238 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->parent_session;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect (_tmp0_, "wire-message-unqueued", (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect (_tmp1_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->parent_session;
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->message;
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_send_wire_message (_tmp2_, _tmp3_);
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->priv->parent_session;
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp5_, NULL, FALSE);
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = self->priv->message;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp7_, NULL, FALSE);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 246 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->err;
-#line 246 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ != NULL) {
-#line 2626 "RESTSupport.c"
+#line 2937 "RESTSupport.c"
 		GError* _tmp9_ = NULL;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->err;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2632 "RESTSupport.c"
+#line 2943 "RESTSupport.c"
 	} else {
-#line 249 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "completed");
-#line 2636 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
 	}
-#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = self->priv->err;
-#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp10_ != NULL) {
-#line 2642 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
 		GError* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp11_ = self->priv->err;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp12_ = _g_error_copy0 (_tmp11_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp12_;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2657 "RESTSupport.c"
+#line 2968 "RESTSupport.c"
 		} else {
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2665 "RESTSupport.c"
+#line 2976 "RESTSupport.c"
 		}
 	}
 }
@@ -2676,27 +2994,27 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	gchar* _tmp3_ = NULL;
 	PublishingRESTSupportHttpMethod _tmp4_ = 0;
 	PublishingRESTSupportHttpMethod _tmp5_ = 0;
-#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp0_, "method", &_tmp1_, NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp3_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp5_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2699 "RESTSupport.c"
+#line 3010 "RESTSupport.c"
 }
 
 
@@ -2705,30 +3023,30 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
 	SoupMessageHeaders* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (key != NULL);
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _tmp0_->request_headers;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = key;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = value;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 2722 "RESTSupport.c"
+#line 3033 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 2731 "RESTSupport.c"
+#line 3042 "RESTSupport.c"
 }
 
 
@@ -2746,111 +3064,104 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 	guint8* _tmp12_ = NULL;
 	gint _tmp12__length1 = 0;
 	gulong _tmp13_ = 0UL;
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (payload_content_type != NULL);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 275 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = custom_payload;
-#line 275 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == NULL) {
-#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->use_custom_payload = FALSE;
-#line 277 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2765 "RESTSupport.c"
+#line 3076 "RESTSupport.c"
 	}
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = payload_length;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ > ((gulong) 0)) {
-#line 2771 "RESTSupport.c"
+#line 3082 "RESTSupport.c"
 		gulong _tmp4_ = 0UL;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = payload_length;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = _tmp4_;
-#line 2777 "RESTSupport.c"
+#line 3088 "RESTSupport.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = custom_payload;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = strlen (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = (gulong) _tmp7_;
-#line 2790 "RESTSupport.c"
+#line 3101 "RESTSupport.c"
 	}
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->message;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = payload_content_type;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = custom_payload;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = _tmp11_;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12__length1 = _tmp11__length1;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = length;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
-#line 283 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->use_custom_payload = TRUE;
-#line 2812 "RESTSupport.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2819 "RESTSupport.c"
+#line 3123 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
 	SoupMessage* _tmp0_ = NULL;
 	SoupMessage* _tmp1_ = NULL;
-#line 291 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 291 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = message;
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp1_;
-#line 2838 "RESTSupport.c"
+#line 3142 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE);
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->is_executed;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2853 "RESTSupport.c"
+#line 3157 "RESTSupport.c"
 }
 
 
@@ -2860,30 +3171,30 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
 	SoupMessage* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
-#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp3_;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2879 "RESTSupport.c"
+#line 3183 "RESTSupport.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 2886 "RESTSupport.c"
+#line 3190 "RESTSupport.c"
 }
 
 
@@ -2897,69 +3208,69 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	gboolean _tmp19_ = FALSE;
 	PublishingRESTSupportHttpMethod _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->use_custom_payload;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->is_executed = TRUE;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2916 "RESTSupport.c"
+#line 3220 "RESTSupport.c"
 			} else {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2924 "RESTSupport.c"
+#line 3228 "RESTSupport.c"
 			}
 		}
-#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2929 "RESTSupport.c"
+#line 3233 "RESTSupport.c"
 	}
-#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (self);
-#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 2935 "RESTSupport.c"
+#line 3239 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->arguments;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2__length1 = self->priv->arguments_length1;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 2944 "RESTSupport.c"
+#line 3248 "RESTSupport.c"
 	}
-#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("");
-#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	formdata_string = _tmp3_;
-#line 2950 "RESTSupport.c"
+#line 3254 "RESTSupport.c"
 	{
 		gint i = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 2955 "RESTSupport.c"
+#line 3259 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 2962 "RESTSupport.c"
+#line 3266 "RESTSupport.c"
 				gint _tmp6_ = 0;
 				PublishingRESTSupportArgument** _tmp7_ = NULL;
 				gint _tmp7__length1 = 0;
@@ -2974,102 +3285,102 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				gint _tmp15_ = 0;
 				PublishingRESTSupportArgument** _tmp16_ = NULL;
 				gint _tmp16__length1 = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 2979 "RESTSupport.c"
+#line 3283 "RESTSupport.c"
 					gint _tmp5_ = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = i;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					i = _tmp5_ + 1;
-#line 2985 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
 				}
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = i;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = self->priv->arguments;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7__length1 = self->priv->arguments_length1;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!(_tmp6_ < _tmp7__length1)) {
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 2999 "RESTSupport.c"
+#line 3303 "RESTSupport.c"
 				}
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = self->priv->arguments;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9__length1 = self->priv->arguments_length1;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = i;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp11_ = _tmp9_[_tmp10_];
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = publishing_rest_support_argument_to_string (_tmp11_);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp13_ = _tmp12_;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (formdata_string);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				formdata_string = _tmp14_;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp13_);
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp15_ = i;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16_ = self->priv->arguments;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16__length1 = self->priv->arguments_length1;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3031 "RESTSupport.c"
+#line 3335 "RESTSupport.c"
 					const gchar* _tmp17_ = NULL;
 					gchar* _tmp18_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = formdata_string;
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp18_ = g_strconcat (_tmp17_, "&", NULL);
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_free0 (formdata_string);
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					formdata_string = _tmp18_;
-#line 3042 "RESTSupport.c"
+#line 3346 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 330 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old_url = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	url_with_query = NULL;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = publishing_rest_support_transaction_get_method (self);
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3055 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = self->priv->arguments;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21__length1 = self->priv->arguments_length1;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = _tmp21__length1 > 0;
-#line 3064 "RESTSupport.c"
+#line 3368 "RESTSupport.c"
 	} else {
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3068 "RESTSupport.c"
+#line 3372 "RESTSupport.c"
 	}
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3072 "RESTSupport.c"
+#line 3376 "RESTSupport.c"
 		SoupMessage* _tmp22_ = NULL;
 		SoupURI* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
@@ -3083,49 +3394,49 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		const gchar* _tmp32_ = NULL;
 		SoupURI* _tmp33_ = NULL;
 		SoupURI* _tmp34_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp22_ = self->priv->message;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp23_ = soup_message_get_uri (_tmp22_);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (old_url);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		old_url = _tmp24_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_strconcat (_tmp26_, "?", NULL);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp29_ = formdata_string;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (url_with_query);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		url_with_query = _tmp30_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp28_);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp26_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp31_ = self->priv->message;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp32_ = url_with_query;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp33_ = soup_uri_new (_tmp32_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp34_ = _tmp33_;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_uri (_tmp31_, _tmp34_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		__vala_SoupURI_free0 (_tmp34_);
-#line 3128 "RESTSupport.c"
+#line 3432 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp35_ = NULL;
 		const gchar* _tmp36_ = NULL;
@@ -3133,122 +3444,122 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		gint _tmp37__length1 = 0;
 		guint8* _tmp38_ = NULL;
 		gint _tmp38__length1 = 0;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp35_ = self->priv->message;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp36_ = formdata_string;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38_ = _tmp37_;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38__length1 = _tmp37__length1;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3148 "RESTSupport.c"
+#line 3452 "RESTSupport.c"
 	}
-#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3152 "RESTSupport.c"
+#line 3456 "RESTSupport.c"
 	{
 		SoupMessage* _tmp39_ = NULL;
 		SoupURI* _tmp40_ = NULL;
 		gchar* _tmp41_ = NULL;
 		gchar* _tmp42_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp39_ = self->priv->message;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp40_ = soup_message_get_uri (_tmp39_);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp41_;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_debug ("RESTSupport.vala:344: sending message to URI = '%s'", _tmp42_);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_debug ("RESTSupport.vala:402: sending message to URI = '%s'", _tmp42_);
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp42_);
-#line 345 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 345 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3174 "RESTSupport.c"
+#line 3478 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
 	__finally1:
 	{
 		const gchar* _tmp43_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp43_ = old_url;
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp43_ != NULL) {
-#line 3185 "RESTSupport.c"
+#line 3489 "RESTSupport.c"
 			SoupMessage* _tmp44_ = NULL;
 			const gchar* _tmp45_ = NULL;
 			SoupURI* _tmp46_ = NULL;
 			SoupURI* _tmp47_ = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp44_ = self->priv->message;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp45_ = old_url;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp46_ = soup_uri_new (_tmp45_);
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp47_ = _tmp46_;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			soup_message_set_uri (_tmp44_, _tmp47_);
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupURI_free0 (_tmp47_);
-#line 3202 "RESTSupport.c"
+#line 3506 "RESTSupport.c"
 		}
 	}
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (old_url);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (formdata_string);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3219 "RESTSupport.c"
+#line 3523 "RESTSupport.c"
 		} else {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (old_url);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (formdata_string);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3233 "RESTSupport.c"
+#line 3537 "RESTSupport.c"
 		}
 	}
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (url_with_query);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (old_url);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (formdata_string);
-#line 3242 "RESTSupport.c"
+#line 3546 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3251 "RESTSupport.c"
+#line 3555 "RESTSupport.c"
 }
 
 
@@ -3260,27 +3571,27 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	guint8* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->response_body;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_->data;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3__length1 = (gint) _tmp2_->length;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp4_;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3283 "RESTSupport.c"
+#line 3587 "RESTSupport.c"
 }
 
 
@@ -3289,21 +3600,21 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
 	gboolean _tmp0_ = FALSE;
 	SoupMessage* _tmp1_ = NULL;
 	SoupMessageHeaders* _tmp2_ = NULL;
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->response_headers;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3306 "RESTSupport.c"
+#line 3610 "RESTSupport.c"
 }
 
 
@@ -3312,38 +3623,38 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	gboolean _tmp0_ = FALSE;
 	SoupMessage* _tmp1_ = NULL;
 	SoupMessage* _tmp2_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3329 "RESTSupport.c"
+#line 3633 "RESTSupport.c"
 }
 
 
 static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((*length) == (*size)) {
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3340 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
 	}
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[(*length)++] = value;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[*length] = NULL;
-#line 3346 "RESTSupport.c"
+#line 3650 "RESTSupport.c"
 }
 
 
@@ -3353,25 +3664,25 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (name != NULL);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->arguments;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->arguments_length1;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = name;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = value;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3374 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
 }
 
 
@@ -3379,49 +3690,49 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->endpoint_url;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 3388 "RESTSupport.c"
+#line 3692 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->endpoint_url;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp3_;
-#line 3399 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
 	} else {
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = self->priv->parent_session;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = publishing_rest_support_session_get_endpoint_url (_tmp4_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp5_;
-#line 3411 "RESTSupport.c"
+#line 3715 "RESTSupport.c"
 	}
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3417 "RESTSupport.c"
+#line 3721 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3424 "RESTSupport.c"
+#line 3728 "RESTSupport.c"
 }
 
 
@@ -3429,17 +3740,17 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	PublishingRESTSupportSession* result = NULL;
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingRESTSupportSession* _tmp1_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->parent_session;
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3442 "RESTSupport.c"
+#line 3746 "RESTSupport.c"
 }
 
 
@@ -3450,267 +3761,267 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = closure->data;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3461 "RESTSupport.c"
+#line 3765 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = closure->data;
-#line 3467 "RESTSupport.c"
+#line 3771 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3473 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_init (GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3480 "RESTSupport.c"
+#line 3784 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_free_value (GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3489 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3499 "RESTSupport.c"
+#line 3803 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3503 "RESTSupport.c"
+#line 3807 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3511 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3518 "RESTSupport.c"
+#line 3822 "RESTSupport.c"
 		PublishingRESTSupportTransaction* object;
 		object = collect_values[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3525 "RESTSupport.c"
+#line 3829 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 3529 "RESTSupport.c"
+#line 3833 "RESTSupport.c"
 		}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3533 "RESTSupport.c"
+#line 3837 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3537 "RESTSupport.c"
+#line 3841 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3541 "RESTSupport.c"
+#line 3845 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportTransaction** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3552 "RESTSupport.c"
+#line 3856 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 3558 "RESTSupport.c"
+#line 3862 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3562 "RESTSupport.c"
+#line 3866 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3566 "RESTSupport.c"
+#line 3870 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3570 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecTransaction* spec;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3584 "RESTSupport.c"
+#line 3888 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3593 "RESTSupport.c"
+#line 3897 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
 	PublishingRESTSupportTransaction* old;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3613 "RESTSupport.c"
+#line 3917 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3617 "RESTSupport.c"
+#line 3921 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3623 "RESTSupport.c"
+#line 3927 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
 	PublishingRESTSupportTransaction* old;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3642 "RESTSupport.c"
+#line 3946 "RESTSupport.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3646 "RESTSupport.c"
+#line 3950 "RESTSupport.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3652 "RESTSupport.c"
+#line 3956 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_transaction_finalize;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_transaction_real_add_header;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_transaction_real_execute;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("chunk_transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3674 "RESTSupport.c"
+#line 3978 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE (self);
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = FALSE;
-#line 142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = NULL;
-#line 143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->bytes_written = 0;
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->err = NULL;
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->endpoint_url = NULL;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 3695 "RESTSupport.c"
+#line 3999 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingRESTSupportTransaction * self;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->arguments = (_vala_array_free (self->priv->arguments, self->priv->arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_error_free0 (self->priv->err);
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 3713 "RESTSupport.c"
+#line 4017 "RESTSupport.c"
 }
 
 
@@ -3731,24 +4042,24 @@ GType publishing_rest_support_transaction_get_type (void) {
 gpointer publishing_rest_support_transaction_ref (gpointer instance) {
 	PublishingRESTSupportTransaction* self;
 	self = instance;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 3738 "RESTSupport.c"
+#line 4042 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_unref (gpointer instance) {
 	PublishingRESTSupportTransaction* self;
 	self = instance;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3751 "RESTSupport.c"
+#line 4055 "RESTSupport.c"
 	}
 }
 
@@ -3763,54 +4074,54 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	gchar* _tmp5_ = NULL;
 	GHashTable* _tmp6_ = NULL;
 	GeeHashMap* _tmp7_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishable;
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = _tmp2_;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishable;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->mime_type = _tmp5_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp6_;
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = _tmp7_;
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 3806 "RESTSupport.c"
+#line 4110 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 3813 "RESTSupport.c"
+#line 4117 "RESTSupport.c"
 }
 
 
@@ -3825,58 +4136,58 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	gchar* _tmp6_ = NULL;
 	GHashTable* _tmp7_ = NULL;
 	GeeHashMap* _tmp8_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishable;
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = _tmp3_;
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishable;
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->mime_type = _tmp6_;
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp7_;
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 3872 "RESTSupport.c"
+#line 4176 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 3879 "RESTSupport.c"
+#line 4183 "RESTSupport.c"
 }
 
 
@@ -3885,74 +4196,74 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
 	GeeHashMap* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (key != NULL);
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->message_headers;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = key;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = value;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 3902 "RESTSupport.c"
+#line 4206 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
 	gchar* result = NULL;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = media_type;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 3913 "RESTSupport.c"
+#line 4217 "RESTSupport.c"
 		gchar* _tmp1_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result = _tmp1_;
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 3921 "RESTSupport.c"
+#line 4225 "RESTSupport.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp2_ = 0;
-#line 415 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = media_type;
-#line 415 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 3928 "RESTSupport.c"
+#line 4232 "RESTSupport.c"
 			gchar* _tmp3_ = NULL;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp3_;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 3936 "RESTSupport.c"
+#line 4240 "RESTSupport.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp4_ = 0;
 			GEnumValue* _tmp5_;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = media_type;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			g_error ("RESTSupport.vala:418: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 3946 "RESTSupport.c"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
+#line 4250 "RESTSupport.c"
 		}
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	var = (g_free (var), NULL);
-#line 3955 "RESTSupport.c"
+#line 4259 "RESTSupport.c"
 }
 
 
@@ -3969,81 +4280,81 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_str_hash;
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_str_equal;
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, _g_free0_);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_result_ = _tmp2_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("filename");
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->publishable;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = g_file_get_basename (_tmp6_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_hash_table_insert (_result_, _tmp3_, _tmp9_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp8_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (_tmp6_);
-#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _result_;
-#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4006 "RESTSupport.c"
+#line 4310 "RESTSupport.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 4013 "RESTSupport.c"
+#line 4317 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
 	GHashTable* _tmp0_ = NULL;
 	GHashTable* _tmp1_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (new_disp_table != NULL);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = new_disp_table;
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp1_;
-#line 4032 "RESTSupport.c"
+#line 4336 "RESTSupport.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4039 "RESTSupport.c"
+#line 4343 "RESTSupport.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4046 "RESTSupport.c"
+#line 4350 "RESTSupport.c"
 }
 
 
@@ -4103,71 +4414,71 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	gboolean _tmp49_ = FALSE;
 	SoupMessage* _tmp61_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = _tmp1_;
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments_length1 = _tmp0_;
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_request_arguments_size_ = request_arguments_length1;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = request_arguments;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = request_arguments_length1;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp2__length1 > 0, "request_arguments.length > 0");
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = soup_multipart_new ("multipart/form-data");
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	message_parts = _tmp3_;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = request_arguments;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4__length1 = request_arguments_length1;
-#line 4130 "RESTSupport.c"
+#line 4434 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
 		gint _arg_collection_size_ = 0;
 		gint arg_it = 0;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection = _tmp4_;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection_length1 = _tmp4__length1;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4142 "RESTSupport.c"
+#line 4446 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp5_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp5_;
-#line 4149 "RESTSupport.c"
+#line 4453 "RESTSupport.c"
 			{
 				SoupMultipart* _tmp6_ = NULL;
 				PublishingRESTSupportArgument* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
 				PublishingRESTSupportArgument* _tmp9_ = NULL;
 				const gchar* _tmp10_ = NULL;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = message_parts;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = arg;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = _tmp7_->key;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = arg;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = _tmp9_->value;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 4170 "RESTSupport.c"
+#line 4474 "RESTSupport.c"
 			}
 		}
 	}
@@ -4179,48 +4490,48 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gsize _tmp17_ = 0UL;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp11_ = self->publishable;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp12_ = spit_publishing_publishable_get_serialized_file (_tmp11_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp13_ = _tmp12_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp15_ = _tmp14_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_file_get_contents (_tmp15_, &_tmp16_, &_tmp17_, &_inner_error_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (payload);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		payload = _tmp16_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		payload_length = _tmp17_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp15_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_tmp13_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4208 "RESTSupport.c"
+#line 4512 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			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 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4223 "RESTSupport.c"
+#line 4527 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
@@ -4229,140 +4540,140 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		GError* e = NULL;
 		const gchar* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		e = _inner_error_;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = _ ("A temporary file needed for publishing is unavailable");
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp18_);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp19_;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (e);
-#line 4244 "RESTSupport.c"
+#line 4548 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4262 "RESTSupport.c"
+#line 4566 "RESTSupport.c"
 		} else {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4276 "RESTSupport.c"
+#line 4580 "RESTSupport.c"
 		}
 	}
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = message_parts;
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = soup_multipart_get_length (_tmp20_);
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	payload_part_num = _tmp21_;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = payload;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = string_get_data (_tmp22_, &_tmp23__length1);
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24__length1 = _tmp23__length1;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = payload_length;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	bindable_data = _tmp26_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp27_ = message_parts;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp28_ = self->publishable;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp30_ = _tmp29_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp31_ = g_file_get_path (_tmp30_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = _tmp31_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33_ = self->mime_type;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp34_ = bindable_data;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_multipart_append_form_file (_tmp27_, "", _tmp32_, _tmp33_, _tmp34_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp32_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (_tmp30_);
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp35_ = message_parts;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp36_ = payload_part_num;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_multipart_get_part (_tmp35_, _tmp36_, &_tmp37_, &_tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	image_part_header = _tmp37_;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	image_part_body = _tmp38_;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp39_ = image_part_header;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp40_ = self->binary_disposition_table;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_set_content_disposition (_tmp39_, "form-data", _tmp40_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp41_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp42_ = _tmp41_;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp43_ = message_parts;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp44_ = soup_form_request_new_from_multipart (_tmp42_, _tmp43_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45_ = _tmp44_;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp42_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	outbound_message = _tmp45_;
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp46_ = self->message_headers;
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp47_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	i = _tmp47_;
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp48_ = i;
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp49_ = gee_map_iterator_next (_tmp48_);
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	cont = _tmp49_;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 4365 "RESTSupport.c"
+#line 4669 "RESTSupport.c"
 		gboolean _tmp50_ = FALSE;
 		SoupMessage* _tmp51_ = NULL;
 		SoupMessageHeaders* _tmp52_ = NULL;
@@ -4374,150 +4685,150 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		gchar* _tmp58_ = NULL;
 		GeeMapIterator* _tmp59_ = NULL;
 		gboolean _tmp60_ = FALSE;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp50_ = cont;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (!_tmp50_) {
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 4383 "RESTSupport.c"
+#line 4687 "RESTSupport.c"
 		}
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = outbound_message;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp52_ = _tmp51_->request_headers;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp53_ = i;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp54_ = gee_map_iterator_get_key (_tmp53_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp55_ = (gchar*) _tmp54_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp56_ = i;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp57_ = gee_map_iterator_get_value (_tmp56_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp58_ = (gchar*) _tmp57_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_headers_append (_tmp52_, _tmp55_, _tmp58_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp58_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp55_);
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp59_ = i;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp60_ = gee_map_iterator_next (_tmp59_);
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		cont = _tmp60_;
-#line 4413 "RESTSupport.c"
+#line 4717 "RESTSupport.c"
 	}
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp61_ = outbound_message;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp61_);
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (outbound_message);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4443 "RESTSupport.c"
+#line 4747 "RESTSupport.c"
 		} else {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (outbound_message);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4463 "RESTSupport.c"
+#line 4767 "RESTSupport.c"
 		}
 	}
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (i);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (outbound_message);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	__vala_SoupBuffer_free0 (bindable_data);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (payload);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4478 "RESTSupport.c"
+#line 4782 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4491 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = NULL;
-#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = NULL;
-#line 4502 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingRESTSupportUploadTransaction * self;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 384 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4520 "RESTSupport.c"
+#line 4824 "RESTSupport.c"
 }
 
 
@@ -4536,22 +4847,22 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
 	PublishingRESTSupportXmlDocument* self = NULL;
 	xmlDoc* _tmp0_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = doc;
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->document = _tmp0_;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4547 "RESTSupport.c"
+#line 4851 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4554 "RESTSupport.c"
+#line 4858 "RESTSupport.c"
 }
 
 
@@ -4559,17 +4870,17 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 	xmlNode* result = NULL;
 	xmlDoc* _tmp0_ = NULL;
 	xmlNode* _tmp1_ = NULL;
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->document;
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = xmlDocGetRootElement (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4572 "RESTSupport.c"
+#line 4876 "RESTSupport.c"
 }
 
 
@@ -4581,92 +4892,92 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 	const gchar* _tmp10_ = NULL;
 	GError* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (child_name != NULL, NULL);
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent;
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _tmp0_->children;
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc_node_iter = _tmp1_;
-#line 4594 "RESTSupport.c"
+#line 4898 "RESTSupport.c"
 	{
 		gboolean _tmp2_ = FALSE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = TRUE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		while (TRUE) {
-#line 4601 "RESTSupport.c"
+#line 4905 "RESTSupport.c"
 			xmlNode* _tmp5_ = NULL;
 			xmlNode* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!_tmp2_) {
-#line 4608 "RESTSupport.c"
+#line 4912 "RESTSupport.c"
 				xmlNode* _tmp3_ = NULL;
 				xmlNode* _tmp4_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = doc_node_iter;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = _tmp3_->next;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				doc_node_iter = _tmp4_;
-#line 4617 "RESTSupport.c"
+#line 4921 "RESTSupport.c"
 			}
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = doc_node_iter;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!(_tmp5_ != NULL)) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				break;
-#line 4627 "RESTSupport.c"
+#line 4931 "RESTSupport.c"
 			}
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp6_->name;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = child_name;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4637 "RESTSupport.c"
+#line 4941 "RESTSupport.c"
 				xmlNode* _tmp9_ = NULL;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				result = _tmp9_;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 4645 "RESTSupport.c"
+#line 4949 "RESTSupport.c"
 			}
 		}
 	}
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = child_name;
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_inner_error_ = _tmp11_;
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4661 "RESTSupport.c"
+#line 4965 "RESTSupport.c"
 	} else {
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4669 "RESTSupport.c"
+#line 4973 "RESTSupport.c"
 	}
 }
 
@@ -4679,63 +4990,63 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 	gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (property_key != NULL, NULL);
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = node;
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = property_key;
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value_string = _tmp2_;
-#line 517 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = value_string;
-#line 517 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 4698 "RESTSupport.c"
+#line 5002 "RESTSupport.c"
 		const gchar* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = property_key;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = node;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = _tmp5_->name;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", _tmp4_, _tmp6_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp7_;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4721 "RESTSupport.c"
+#line 5025 "RESTSupport.c"
 		} else {
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4731 "RESTSupport.c"
+#line 5035 "RESTSupport.c"
 		}
 	}
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = value_string;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4738 "RESTSupport.c"
+#line 5042 "RESTSupport.c"
 }
 
 
@@ -4758,7 +5069,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4761 "RESTSupport.c"
+#line 5065 "RESTSupport.c"
 }
 
 
@@ -4781,7 +5092,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4784 "RESTSupport.c"
+#line 5088 "RESTSupport.c"
 }
 
 
@@ -4816,75 +5127,75 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	gchar* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = input_string;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == NULL) {
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = TRUE;
-#line 4825 "RESTSupport.c"
+#line 5129 "RESTSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = input_string;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 4838 "RESTSupport.c"
+#line 5142 "RESTSupport.c"
 	}
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 4842 "RESTSupport.c"
+#line 5146 "RESTSupport.c"
 		GError* _tmp5_ = NULL;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp5_;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4854 "RESTSupport.c"
+#line 5158 "RESTSupport.c"
 		} else {
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4862 "RESTSupport.c"
+#line 5166 "RESTSupport.c"
 		}
 	}
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = input_string;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = string_chug (_tmp7_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = string_chomp (_tmp9_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = _tmp10_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = g_str_has_prefix (_tmp11_, "<");
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = !_tmp12_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp11_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp13_) {
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 4887 "RESTSupport.c"
+#line 5191 "RESTSupport.c"
 	} else {
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -4892,395 +5203,395 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gboolean _tmp19_ = FALSE;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = input_string;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp15_ = string_chug (_tmp14_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp16_ = _tmp15_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp17_ = string_chomp (_tmp16_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = _tmp17_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = g_str_has_suffix (_tmp18_, ">");
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = !_tmp19_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp18_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp16_);
-#line 4913 "RESTSupport.c"
+#line 5217 "RESTSupport.c"
 	}
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 4917 "RESTSupport.c"
+#line 5221 "RESTSupport.c"
 		GError* _tmp20_ = NULL;
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp20_;
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4929 "RESTSupport.c"
+#line 5233 "RESTSupport.c"
 		} else {
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4937 "RESTSupport.c"
+#line 5241 "RESTSupport.c"
 		}
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = input_string;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = input_string;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = strlen (_tmp22_);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc = _tmp25_;
-#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = doc;
-#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp26_ == NULL) {
-#line 4956 "RESTSupport.c"
+#line 5260 "RESTSupport.c"
 		GError* _tmp27_ = NULL;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp27_;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4968 "RESTSupport.c"
+#line 5272 "RESTSupport.c"
 		} else {
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4976 "RESTSupport.c"
+#line 5280 "RESTSupport.c"
 		}
 	}
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp28_ = doc;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = _tmp28_->children;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == NULL) {
-#line 4985 "RESTSupport.c"
+#line 5289 "RESTSupport.c"
 		GError* _tmp30_ = NULL;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp30_;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4997 "RESTSupport.c"
+#line 5301 "RESTSupport.c"
 		} else {
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5005 "RESTSupport.c"
+#line 5309 "RESTSupport.c"
 		}
 	}
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp31_ = doc;
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	rest_doc = _tmp32_;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33_ = check_for_error_response;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33__target = check_for_error_response_target;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp34_ = rest_doc;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_result_ = _tmp35_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp36_ = _result_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp36_ != NULL) {
-#line 5028 "RESTSupport.c"
+#line 5332 "RESTSupport.c"
 		const gchar* _tmp37_ = NULL;
 		GError* _tmp38_ = NULL;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp37_ = _result_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp38_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5047 "RESTSupport.c"
+#line 5351 "RESTSupport.c"
 		} else {
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5059 "RESTSupport.c"
+#line 5363 "RESTSupport.c"
 		}
 	}
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = rest_doc;
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_result_);
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5068 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_init (GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5075 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5084 "RESTSupport.c"
+#line 5388 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5094 "RESTSupport.c"
+#line 5398 "RESTSupport.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5098 "RESTSupport.c"
+#line 5402 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5106 "RESTSupport.c"
+#line 5410 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5113 "RESTSupport.c"
+#line 5417 "RESTSupport.c"
 		PublishingRESTSupportXmlDocument* object;
 		object = collect_values[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5120 "RESTSupport.c"
+#line 5424 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 5124 "RESTSupport.c"
+#line 5428 "RESTSupport.c"
 		}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5128 "RESTSupport.c"
+#line 5432 "RESTSupport.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5132 "RESTSupport.c"
+#line 5436 "RESTSupport.c"
 	}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5136 "RESTSupport.c"
+#line 5440 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportXmlDocument** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5147 "RESTSupport.c"
+#line 5451 "RESTSupport.c"
 	}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 5153 "RESTSupport.c"
+#line 5457 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5157 "RESTSupport.c"
+#line 5461 "RESTSupport.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5161 "RESTSupport.c"
+#line 5465 "RESTSupport.c"
 	}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5165 "RESTSupport.c"
+#line 5469 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecXmlDocument* spec;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5179 "RESTSupport.c"
+#line 5483 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5188 "RESTSupport.c"
+#line 5492 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
 	PublishingRESTSupportXmlDocument* old;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5208 "RESTSupport.c"
+#line 5512 "RESTSupport.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5212 "RESTSupport.c"
+#line 5516 "RESTSupport.c"
 	}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5218 "RESTSupport.c"
+#line 5522 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
 	PublishingRESTSupportXmlDocument* old;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5237 "RESTSupport.c"
+#line 5541 "RESTSupport.c"
 	} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5241 "RESTSupport.c"
+#line 5545 "RESTSupport.c"
 	}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5247 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_xml_document_parent_class = g_type_class_peek_parent (klass);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5259 "RESTSupport.c"
+#line 5563 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 5268 "RESTSupport.c"
+#line 5572 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj) {
 	PublishingRESTSupportXmlDocument * self;
 	xmlDoc* _tmp0_ = NULL;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->document;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	xmlFreeDoc (_tmp0_);
-#line 5283 "RESTSupport.c"
+#line 5587 "RESTSupport.c"
 }
 
 
@@ -5301,24 +5612,24 @@ GType publishing_rest_support_xml_document_get_type (void) {
 gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
 	PublishingRESTSupportXmlDocument* self;
 	self = instance;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 5308 "RESTSupport.c"
+#line 5612 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_xml_document_unref (gpointer instance) {
 	PublishingRESTSupportXmlDocument* self;
 	self = instance;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5321 "RESTSupport.c"
+#line 5625 "RESTSupport.c"
 	}
 }
 
@@ -5333,21 +5644,21 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	GString* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
 	gchar* _tmp25_ = NULL;
-#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (source != NULL, NULL);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_string_new ("");
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	encoded_str_builder = _tmp0_;
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = source;
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	current_char = _tmp2_;
-#line 570 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 5350 "RESTSupport.c"
+#line 5654 "RESTSupport.c"
 		gint current_char_value = 0;
 		const gchar* _tmp3_ = NULL;
 		gunichar _tmp4_ = 0U;
@@ -5359,146 +5670,146 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		const gchar* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = current_char;
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char_value = (gint) _tmp4_;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = current_char_value;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp5_ < 1) {
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 5374 "RESTSupport.c"
+#line 5678 "RESTSupport.c"
 		}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp9_ < 128) {
-#line 5380 "RESTSupport.c"
+#line 5684 "RESTSupport.c"
 			gint _tmp10_ = 0;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5386 "RESTSupport.c"
+#line 5690 "RESTSupport.c"
 		} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5390 "RESTSupport.c"
+#line 5694 "RESTSupport.c"
 		}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5394 "RESTSupport.c"
+#line 5698 "RESTSupport.c"
 			gint _tmp11_ = 0;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5400 "RESTSupport.c"
+#line 5704 "RESTSupport.c"
 		} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5404 "RESTSupport.c"
+#line 5708 "RESTSupport.c"
 		}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5408 "RESTSupport.c"
+#line 5712 "RESTSupport.c"
 			gint _tmp12_ = 0;
-#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = current_char_value;
-#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5414 "RESTSupport.c"
+#line 5718 "RESTSupport.c"
 		} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5418 "RESTSupport.c"
+#line 5722 "RESTSupport.c"
 		}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5422 "RESTSupport.c"
+#line 5726 "RESTSupport.c"
 			GString* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			gunichar _tmp15_ = 0U;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp13_ = encoded_str_builder;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp14_ = current_char;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5434 "RESTSupport.c"
+#line 5738 "RESTSupport.c"
 		} else {
 			GString* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp16_ = encoded_str_builder;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp17_ = current_char_value;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp18_ = g_strdup_printf ("&#%d;", _tmp17_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp19_ = _tmp18_;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append (_tmp16_, _tmp19_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp19_);
-#line 5452 "RESTSupport.c"
+#line 5756 "RESTSupport.c"
 		}
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = g_utf8_next_char (_tmp20_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp22_ = g_strdup (_tmp21_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (current_char);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char = _tmp22_;
-#line 5464 "RESTSupport.c"
+#line 5768 "RESTSupport.c"
 	}
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_->str;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = g_strdup (_tmp24_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp25_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (current_char);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (encoded_str_builder);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5480 "RESTSupport.c"
+#line 5784 "RESTSupport.c"
 }
 
 
 static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 5491 "RESTSupport.c"
+#line 5795 "RESTSupport.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 5497 "RESTSupport.c"
+#line 5801 "RESTSupport.c"
 	}
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5501 "RESTSupport.c"
+#line 5805 "RESTSupport.c"
 }
 
 
@@ -5510,44 +5821,44 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportSession* _tmp2_ = NULL;
 	PublishingRESTSupportSession* _tmp3_ = NULL;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishables;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = publishables_length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = _tmp1_;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables_length1 = _tmp1__length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = session;
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = _tmp3_;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 5543 "RESTSupport.c"
+#line 5847 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5550 "RESTSupport.c"
+#line 5854 "RESTSupport.c"
 }
 
 
@@ -5557,36 +5868,36 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	gint _tmp0__length1 = 0;
 	gboolean _tmp23_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->current_file = 0;
-#line 607 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	stop = FALSE;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 5570 "RESTSupport.c"
+#line 5874 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
 		gint _publishable_collection_size_ = 0;
 		gint publishable_it = 0;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishable_collection = _tmp0_;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishable_collection_length1 = _tmp0__length1;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5582 "RESTSupport.c"
+#line 5886 "RESTSupport.c"
 			SpitPublishingPublishable* _tmp1_ = NULL;
 			SpitPublishingPublishable* publishable = NULL;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishable = _tmp1_;
-#line 5589 "RESTSupport.c"
+#line 5893 "RESTSupport.c"
 			{
 				GFile* file = NULL;
 				SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5609,104 +5920,104 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				guint _tmp20_ = 0U;
 				gboolean _tmp21_ = FALSE;
 				gint _tmp22_ = 0;
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp2_ = publishable;
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = spit_publishing_publishable_get_serialized_file (_tmp2_);
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				file = _tmp3_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = file;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp4_ == NULL) {
-#line 5622 "RESTSupport.c"
+#line 5926 "RESTSupport.c"
 					gint _tmp5_ = 0;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					self->priv->current_file = _tmp5_ + 1;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					continue;
-#line 5634 "RESTSupport.c"
+#line 5938 "RESTSupport.c"
 				}
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = self->priv->publishables;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7__length1 = self->priv->publishables_length1;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				fraction_complete = ((gdouble) _tmp6_) / _tmp7__length1;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = self->priv->status_updated;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8__target = self->priv->status_updated_target;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp8_ != NULL) {
-#line 5650 "RESTSupport.c"
+#line 5954 "RESTSupport.c"
 					SpitPublishingProgressCallback _tmp9_ = NULL;
 					void* _tmp9__target = NULL;
 					gint _tmp10_ = 0;
 					gdouble _tmp11_ = 0.0;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ = self->priv->status_updated;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9__target = self->priv->status_updated_target;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp10_ = self->priv->current_file;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp11_ = fraction_complete;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5665 "RESTSupport.c"
+#line 5969 "RESTSupport.c"
 				}
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12__length1 = self->priv->publishables_length1;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp13_ = self->priv->current_file;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp14_ = _tmp12_[_tmp13_];
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp15_ = publishing_rest_support_batch_uploader_create_transaction (self, _tmp14_);
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				txn = _tmp15_;
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16_ = txn;
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5683 "RESTSupport.c"
+#line 5987 "RESTSupport.c"
 				{
 					PublishingRESTSupportTransaction* _tmp17_ = NULL;
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = txn;
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					publishing_rest_support_transaction_execute (_tmp17_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5694 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_publishing_rest_support_transaction_unref0 (txn);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_g_object_unref0 (file);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_g_object_unref0 (publishable);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						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 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						return;
-#line 5709 "RESTSupport.c"
+#line 6013 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
@@ -5714,82 +6025,82 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				{
 					GError* err = NULL;
 					GError* _tmp18_ = NULL;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					err = _inner_error_;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_inner_error_ = NULL;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp18_ = err;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_signal_emit_by_name (self, "upload-error", _tmp18_);
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					stop = TRUE;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_error_free0 (err);
-#line 5729 "RESTSupport.c"
+#line 6033 "RESTSupport.c"
 				}
 				__finally3:
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_publishing_rest_support_transaction_unref0 (txn);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 5746 "RESTSupport.c"
+#line 6050 "RESTSupport.c"
 				}
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_parse_name ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp20_, NULL, FALSE);
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 634 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp21_ = stop;
-#line 634 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp21_) {
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_publishing_rest_support_transaction_unref0 (txn);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 5766 "RESTSupport.c"
+#line 6070 "RESTSupport.c"
 				}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				self->priv->current_file = _tmp22_ + 1;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_transaction_unref0 (txn);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (file);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (publishable);
-#line 5778 "RESTSupport.c"
+#line 6082 "RESTSupport.c"
 			}
 		}
 	}
-#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = stop;
-#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp23_) {
-#line 5786 "RESTSupport.c"
+#line 6090 "RESTSupport.c"
 		gint _tmp24_ = 0;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = self->priv->current_file;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 5792 "RESTSupport.c"
+#line 6096 "RESTSupport.c"
 	}
 }
 
@@ -5808,52 +6119,52 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 	gdouble _tmp6_ = 0.0;
 	SpitPublishingProgressCallback _tmp7_ = NULL;
 	void* _tmp7__target = NULL;
-#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	file_span = 1.0 / _tmp0__length1;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = bytes_written_so_far;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = total_bytes;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->current_file;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = file_span;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = this_file_fraction_complete;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = file_span;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = self->priv->status_updated;
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7__target = self->priv->status_updated_target;
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5841 "RESTSupport.c"
+#line 6145 "RESTSupport.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
 		gdouble _tmp10_ = 0.0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = self->priv->status_updated;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8__target = self->priv->status_updated_target;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->current_file;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp10_ = fraction_complete;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 5856 "RESTSupport.c"
+#line 6160 "RESTSupport.c"
 	}
 }
 
@@ -5862,17 +6173,17 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	PublishingRESTSupportSession* result = NULL;
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingRESTSupportSession* _tmp1_ = NULL;
-#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->session;
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5875 "RESTSupport.c"
+#line 6179 "RESTSupport.c"
 }
 
 
@@ -5883,41 +6194,41 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
 	gint _tmp1_ = 0;
 	SpitPublishingPublishable* _tmp2_ = NULL;
 	SpitPublishingPublishable* _tmp3_ = NULL;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->current_file;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp3_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5902 "RESTSupport.c"
+#line 6206 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5911 "RESTSupport.c"
+#line 6215 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 5920 "RESTSupport.c"
+#line 6224 "RESTSupport.c"
 }
 
 
@@ -5926,258 +6237,258 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 	void* _tmp0__target = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = status_updated;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__target = status_updated_target;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated = _tmp0_;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated_target = _tmp0__target;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->publishables;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = self->priv->publishables_length1;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1__length1 > 0) {
-#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_send_files (self);
-#line 5947 "RESTSupport.c"
+#line 6251 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5955 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 5964 "RESTSupport.c"
+#line 6268 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 5974 "RESTSupport.c"
+#line 6278 "RESTSupport.c"
 	} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5978 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5986 "RESTSupport.c"
+#line 6290 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5993 "RESTSupport.c"
+#line 6297 "RESTSupport.c"
 		PublishingRESTSupportBatchUploader* object;
 		object = collect_values[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6000 "RESTSupport.c"
+#line 6304 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 6004 "RESTSupport.c"
+#line 6308 "RESTSupport.c"
 		}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6008 "RESTSupport.c"
+#line 6312 "RESTSupport.c"
 	} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6012 "RESTSupport.c"
+#line 6316 "RESTSupport.c"
 	}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6016 "RESTSupport.c"
+#line 6320 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportBatchUploader** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6027 "RESTSupport.c"
+#line 6331 "RESTSupport.c"
 	}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 6033 "RESTSupport.c"
+#line 6337 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6037 "RESTSupport.c"
+#line 6341 "RESTSupport.c"
 	} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6041 "RESTSupport.c"
+#line 6345 "RESTSupport.c"
 	}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6045 "RESTSupport.c"
+#line 6349 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecBatchUploader* spec;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 6059 "RESTSupport.c"
+#line 6363 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6068 "RESTSupport.c"
+#line 6372 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
 	PublishingRESTSupportBatchUploader* old;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6088 "RESTSupport.c"
+#line 6392 "RESTSupport.c"
 	} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6092 "RESTSupport.c"
+#line 6396 "RESTSupport.c"
 	}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6098 "RESTSupport.c"
+#line 6402 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
 	PublishingRESTSupportBatchUploader* old;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 6117 "RESTSupport.c"
+#line 6421 "RESTSupport.c"
 	} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6121 "RESTSupport.c"
+#line 6425 "RESTSupport.c"
 	}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6127 "RESTSupport.c"
+#line 6431 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_rest_support_batch_uploader_finalize;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_rest_support_batch_uploader_real_create_transaction;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6145 "RESTSupport.c"
+#line 6449 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE (self);
-#line 592 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->current_file = 0;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = NULL;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables_length1 = 0;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = NULL;
-#line 595 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated = NULL;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 6166 "RESTSupport.c"
+#line 6470 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingRESTSupportBatchUploader * self;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6180 "RESTSupport.c"
+#line 6484 "RESTSupport.c"
 }
 
 
@@ -6198,24 +6509,24 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
 gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
 	PublishingRESTSupportBatchUploader* self;
 	self = instance;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 6205 "RESTSupport.c"
+#line 6509 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_batch_uploader_unref (gpointer instance) {
 	PublishingRESTSupportBatchUploader* self;
 	self = instance;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6218 "RESTSupport.c"
+#line 6522 "RESTSupport.c"
 	}
 }
 
@@ -6234,7 +6545,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6237 "RESTSupport.c"
+#line 6541 "RESTSupport.c"
 }
 
 
@@ -6248,201 +6559,201 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	GString* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = s;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	t = _tmp1_;
-#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_string_new ("");
-#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	b = _tmp2_;
-#line 6263 "RESTSupport.c"
+#line 6567 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = t;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		u = _tmp3_;
-#line 6271 "RESTSupport.c"
+#line 6575 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 6278 "RESTSupport.c"
+#line 6582 "RESTSupport.c"
 				const gchar* _tmp7_ = NULL;
 				gunichar _tmp8_ = 0U;
 				gunichar c = 0U;
 				const gchar* _tmp9_ = NULL;
 				gunichar _tmp10_ = 0U;
 				gunichar _tmp11_ = 0U;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 6287 "RESTSupport.c"
+#line 6591 "RESTSupport.c"
 					const gchar* _tmp5_ = NULL;
 					const gchar* _tmp6_ = NULL;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = u;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp6_ = g_utf8_next_char (_tmp5_);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					u = _tmp6_;
-#line 6296 "RESTSupport.c"
+#line 6600 "RESTSupport.c"
 				}
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = u;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = string_get_char (_tmp7_, (glong) 0);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!(_tmp8_ != ((gunichar) 0))) {
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6308 "RESTSupport.c"
+#line 6612 "RESTSupport.c"
 				}
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = string_get_char (_tmp9_, (glong) 0);
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				c = _tmp10_;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp11_ = c;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (((gint) _tmp11_) < 128) {
-#line 6320 "RESTSupport.c"
+#line 6624 "RESTSupport.c"
 					GString* _tmp12_ = NULL;
 					gunichar _tmp13_ = 0U;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp12_ = b;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp13_ = c;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6329 "RESTSupport.c"
+#line 6633 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = b;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = _tmp14_->str;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp16_;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (b);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (t);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6348 "RESTSupport.c"
+#line 6652 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6357 "RESTSupport.c"
+#line 6661 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6366 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6375 "RESTSupport.c"
+#line 6679 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6384 "RESTSupport.c"
+#line 6688 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_session_real_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6393 "RESTSupport.c"
+#line 6697 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6402 "RESTSupport.c"
+#line 6706 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6411 "RESTSupport.c"
+#line 6715 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6420 "RESTSupport.c"
+#line 6724 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type) {
 	PublishingRESTSupportGoogleSession* self = NULL;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6430 "RESTSupport.c"
+#line 6734 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_session_real_get_user_name;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_session_real_get_access_token;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6445 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
 }
 
 
@@ -6469,50 +6780,50 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
 	SpitPublishingService* _tmp3_ = NULL;
 	SpitPublishingPluginHost* _tmp4_ = NULL;
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (scope != NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = scope;
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->scope = _tmp1_;
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = _tmp2_;
-#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = service;
-#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->service = _tmp3_;
-#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = host;
-#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->host = _tmp4_;
-#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->web_auth_pane);
-#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->web_auth_pane = NULL;
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6508 "RESTSupport.c"
+#line 6812 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6515 "RESTSupport.c"
+#line 6819 "RESTSupport.c"
 }
 
 
@@ -6523,50 +6834,50 @@ static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized
 	const gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	const gchar* _tmp5_ = NULL;
-#line 879 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 879 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (auth_code != NULL);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->web_auth_pane;
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, &_tmp1_, NULL, FALSE);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self);
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->scope;
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = auth_code;
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:882: EVENT: user authorized scope %s with auth_code %" \
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:892: EVENT: user authorized scope %s with auth_code %" \
 "s", _tmp2_, _tmp3_);
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6548 "RESTSupport.c"
+#line 6852 "RESTSupport.c"
 	}
-#line 887 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = auth_code;
-#line 887 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6554 "RESTSupport.c"
+#line 6858 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6561 "RESTSupport.c"
+#line 6865 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6568 "RESTSupport.c"
+#line 6872 "RESTSupport.c"
 }
 
 
@@ -6579,44 +6890,44 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:894: %s", "EVENT: network transaction to exchange authorization code for access t" \
+#line 904 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:904: %s", "EVENT: network transaction to exchange authorization code for access t" \
 "okens " "completed successfully.");
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 898 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6605 "RESTSupport.c"
+#line 6909 "RESTSupport.c"
 	}
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 6617 "RESTSupport.c"
+#line 6921 "RESTSupport.c"
 }
 
 
@@ -6631,62 +6942,62 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
 	gboolean _tmp7_ = FALSE;
 	SpitPublishingPluginHost* _tmp8_ = NULL;
 	GError* _tmp9_ = NULL;
-#line 903 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 903 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = txn;
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_debug ("EVENT: network transaction to exchange authorization code for access t" \
 "okens " "failed; response = '%s'", _tmp6_);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp6_);
-#line 911 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_is_running (self);
-#line 911 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp7_) {
-#line 912 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6664 "RESTSupport.c"
+#line 6968 "RESTSupport.c"
 	}
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->host;
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = err;
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6672 "RESTSupport.c"
+#line 6976 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6679 "RESTSupport.c"
+#line 6983 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6686 "RESTSupport.c"
+#line 6990 "RESTSupport.c"
 }
 
 
@@ -6701,54 +7012,54 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	PublishingRESTSupportTransaction* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 917 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 917 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:922: EVENT: refresh access token transaction complete" \
+#line 932 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:932: EVENT: refresh access token transaction complete" \
 "d successfully.");
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 925 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6725 "RESTSupport.c"
+#line 7029 "RESTSupport.c"
 	}
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 928 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6735 "RESTSupport.c"
+#line 7039 "RESTSupport.c"
 	}
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 6747 "RESTSupport.c"
+#line 7051 "RESTSupport.c"
 }
 
 
@@ -6764,62 +7075,62 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	guint _tmp8_ = 0U;
 	SpitPublishingPluginHost* _tmp9_ = NULL;
 	GError* _tmp10_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 933 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:938: EVENT: refresh access token transaction caused a" \
+#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:948: EVENT: refresh access token transaction caused a" \
 " network error.");
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 941 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6787 "RESTSupport.c"
+#line 7091 "RESTSupport.c"
 	}
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 944 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6797 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
 	}
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ == ((guint) 400)) {
-#line 949 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_logout (self);
-#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6809 "RESTSupport.c"
+#line 7113 "RESTSupport.c"
 	}
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = self->priv->host;
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = err;
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 6817 "RESTSupport.c"
+#line 7121 "RESTSupport.c"
 }
 
 
@@ -6829,34 +7140,34 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 956 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 956 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (token != NULL);
-#line 957 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = token;
-#line 957 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:957: EVENT: an OAuth refresh token has become availab" \
+#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:967: EVENT: an OAuth refresh token has become availab" \
 "le; token = '%s'.", _tmp0_);
-#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp1_) {
-#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6841 "RESTSupport.c"
+#line 7145 "RESTSupport.c"
 	}
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = token;
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp2_->refresh_token);
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_->refresh_token = _tmp4_;
-#line 6853 "RESTSupport.c"
+#line 7157 "RESTSupport.c"
 }
 
 
@@ -6866,50 +7177,50 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 965 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 965 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (token != NULL);
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = token;
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:966: EVENT: an OAuth access token has become availabl" \
+#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:976: EVENT: an OAuth access token has become availabl" \
 "e; token = '%s'.", _tmp0_);
-#line 968 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 968 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp1_) {
-#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6877 "RESTSupport.c"
+#line 7181 "RESTSupport.c"
 	}
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = token;
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp2_->access_token);
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_->access_token = _tmp4_;
-#line 973 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 6891 "RESTSupport.c"
+#line 7195 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6898 "RESTSupport.c"
+#line 7202 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6905 "RESTSupport.c"
+#line 7209 "RESTSupport.c"
 }
 
 
@@ -6922,44 +7233,44 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 980 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:980: EVENT: username fetch transaction completed succ" \
+#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:990: EVENT: username fetch transaction completed succ" \
 "essfully.");
-#line 982 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 982 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6942 "RESTSupport.c"
+#line 7246 "RESTSupport.c"
 	}
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 6954 "RESTSupport.c"
+#line 7258 "RESTSupport.c"
 }
 
 
@@ -6971,40 +7282,40 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	gboolean _tmp4_ = FALSE;
 	SpitPublishingPluginHost* _tmp5_ = NULL;
 	GError* _tmp6_ = NULL;
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = txn;
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = txn;
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:993: EVENT: username fetch transaction caused a netwo" \
-"rk error");
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1003: EVENT: username fetch transaction caused a netw" \
+"ork error");
+#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp4_) {
-#line 996 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6990 "RESTSupport.c"
+#line 7294 "RESTSupport.c"
 	}
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->host;
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = err;
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 6998 "RESTSupport.c"
+#line 7302 "RESTSupport.c"
 }
 
 
@@ -7015,49 +7326,49 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (auth_code != NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1002: ACTION: exchanging authorization code for acces" \
+#line 1012 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1012: ACTION: exchanging authorization code for acces" \
 "s & refresh tokens");
-#line 1004 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 1004 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->session;
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = auth_code;
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishing_rest_support_google_publisher_get_access_tokens_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_);
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	tokens_txn = _tmp3_;
-#line 1007 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7031 "RESTSupport.c"
+#line 7335 "RESTSupport.c"
 	{
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7039 "RESTSupport.c"
+#line 7343 "RESTSupport.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			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 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 7050 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
 		}
 	}
 	goto __finally4;
@@ -7066,36 +7377,36 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = self->priv->host;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = err;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7071 "RESTSupport.c"
+#line 7375 "RESTSupport.c"
 	}
 	__finally4:
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7084 "RESTSupport.c"
+#line 7388 "RESTSupport.c"
 	}
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7088 "RESTSupport.c"
+#line 7392 "RESTSupport.c"
 }
 
 
@@ -7132,110 +7443,110 @@ static void publishing_rest_support_google_publisher_do_hosted_web_authenticatio
 	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp28_ = NULL;
 	SpitPublishingPluginHost* _tmp29_ = NULL;
 	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp30_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1018: ACTION: running OAuth authentication flow in ho" \
+#line 1028 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1028: ACTION: running OAuth authentication flow in ho" \
 "sted web pane.");
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = soup_uri_encode ("urn:ietf:wg:oauth:2.0:oob", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strconcat ("https://accounts.google.com/o/oauth2/auth?" "response_type=code&" "client_id=" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID "&" "redirect_uri=", _tmp1_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = g_strconcat (_tmp3_, "&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = g_strconcat (_tmp5_, "scope=", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->scope;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = _tmp9_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = _tmp11_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = g_strconcat (_tmp12_, "+", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = _tmp13_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = soup_uri_encode ("https://www.googleapis.com/auth/userinfo.profile", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_ = _tmp15_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp17_ = g_strconcat (_tmp14_, _tmp16_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp18_ = _tmp17_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp19_ = g_strconcat (_tmp18_, "&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = g_strconcat (_tmp20_, "state=connect&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = _tmp21_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = g_strconcat (_tmp22_, "access_type=offline&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = g_strconcat (_tmp24_, "approval_prompt=force", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp24_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp22_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp20_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp18_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp16_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp14_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp12_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp10_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp5_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp3_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp1_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	user_authorization_url = _tmp26_;
 #line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	user_authorization_url = _tmp26_;
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp27_ = publishing_rest_support_google_publisher_web_authentication_pane_new (user_authorization_url);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->web_auth_pane);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->web_auth_pane = _tmp27_;
-#line 1031 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp28_ = self->priv->web_auth_pane;
-#line 1031 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (_tmp28_, "authorized", (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self, 0);
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = self->priv->host;
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp30_ = self->priv->web_auth_pane;
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (user_authorization_url);
-#line 7227 "RESTSupport.c"
+#line 7531 "RESTSupport.c"
 }
 
 
@@ -7245,45 +7556,45 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_ = NULL;
 	PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1038 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1038: ACTION: exchanging OAuth refresh token for OAut" \
+#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1048: ACTION: exchanging OAuth refresh token for OAut" \
 "h access token.");
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->session;
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_refresh_access_token_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	txn = _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1045 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7255 "RESTSupport.c"
+#line 7559 "RESTSupport.c"
 	{
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7263 "RESTSupport.c"
+#line 7567 "RESTSupport.c"
 				goto __catch5_spit_publishing_publishing_error;
 			}
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			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 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 7274 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
 		}
 	}
 	goto __finally5;
@@ -7292,43 +7603,43 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = self->priv->host;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = err;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7295 "RESTSupport.c"
+#line 7599 "RESTSupport.c"
 	}
 	__finally5:
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7308 "RESTSupport.c"
+#line 7612 "RESTSupport.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7312 "RESTSupport.c"
+#line 7616 "RESTSupport.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 7319 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
 }
 
 
@@ -7348,30 +7659,30 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 	JsonObject* _tmp29_ = NULL;
 	gboolean _tmp30_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (response_body != NULL);
-#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1055: ACTION: extracting OAuth tokens from body of se" \
+#line 1065 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1065: ACTION: extracting OAuth tokens from body of se" \
 "rver response");
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = json_parser_new ();
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	parser = _tmp0_;
-#line 7349 "RESTSupport.c"
+#line 7653 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = parser;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = response_body;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7361 "RESTSupport.c"
+#line 7665 "RESTSupport.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -7386,183 +7697,183 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = self->priv->host;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = err;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (_tmp9_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp7_);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (parser);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7406 "RESTSupport.c"
+#line 7710 "RESTSupport.c"
 	}
 	__finally6:
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (parser);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7419 "RESTSupport.c"
+#line 7723 "RESTSupport.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = json_node_get_object (_tmp11_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	response_obj = _tmp13_;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = response_obj;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp16_) {
-#line 7437 "RESTSupport.c"
+#line 7741 "RESTSupport.c"
 		JsonObject* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp17_ = response_obj;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = !_tmp18_;
-#line 7446 "RESTSupport.c"
+#line 7750 "RESTSupport.c"
 	} else {
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = FALSE;
-#line 7450 "RESTSupport.c"
+#line 7754 "RESTSupport.c"
 	}
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp14_) {
-#line 7454 "RESTSupport.c"
+#line 7758 "RESTSupport.c"
 		SpitPublishingPluginHost* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
 		GError* _tmp21_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = self->priv->host;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = _tmp20_;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (_tmp21_);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_json_object_unref0 (response_obj);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (parser);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7474 "RESTSupport.c"
+#line 7778 "RESTSupport.c"
 	}
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = response_obj;
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp23_) {
-#line 7482 "RESTSupport.c"
+#line 7786 "RESTSupport.c"
 		gchar* refresh_token = NULL;
 		JsonObject* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = response_obj;
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp26_ = g_strdup (_tmp25_);
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		refresh_token = _tmp26_;
-#line 1078 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = refresh_token;
-#line 1078 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7500 "RESTSupport.c"
+#line 7804 "RESTSupport.c"
 			const gchar* _tmp28_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp28_ = refresh_token;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7506 "RESTSupport.c"
+#line 7810 "RESTSupport.c"
 		}
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (refresh_token);
-#line 7510 "RESTSupport.c"
+#line 7814 "RESTSupport.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = response_obj;
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp30_ = json_object_has_member (_tmp29_, "access_token");
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp30_) {
-#line 7518 "RESTSupport.c"
+#line 7822 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
 		gchar* _tmp33_ = NULL;
 		const gchar* _tmp34_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp31_ = response_obj;
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp32_ = json_object_get_string_member (_tmp31_, "access_token");
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp33_ = g_strdup (_tmp32_);
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		access_token = _tmp33_;
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp34_ = access_token;
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7536 "RESTSupport.c"
+#line 7840 "RESTSupport.c"
 			const gchar* _tmp35_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp35_ = access_token;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7542 "RESTSupport.c"
+#line 7846 "RESTSupport.c"
 		}
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 7546 "RESTSupport.c"
+#line 7850 "RESTSupport.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_json_object_unref0 (response_obj);
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (parser);
-#line 7552 "RESTSupport.c"
+#line 7856 "RESTSupport.c"
 }
 
 
@@ -7573,36 +7884,36 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
 	PublishingRESTSupportGooglePublisherUsernameFetchTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1091 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1091: ACTION: running network transaction to fetch us" \
+#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1101: ACTION: running network transaction to fetch us" \
 "ername.");
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1094 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->host;
-#line 1094 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishing_rest_support_google_publisher_username_fetch_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	txn = _tmp3_;
-#line 1097 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1098 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7585 "RESTSupport.c"
+#line 7889 "RESTSupport.c"
 	{
-#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7591 "RESTSupport.c"
+#line 7895 "RESTSupport.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -7612,36 +7923,36 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = self->priv->host;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = err;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7613 "RESTSupport.c"
+#line 7917 "RESTSupport.c"
 	}
 	__finally7:
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7626 "RESTSupport.c"
+#line 7930 "RESTSupport.c"
 	}
-#line 1090 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7630 "RESTSupport.c"
+#line 7934 "RESTSupport.c"
 }
 
 
@@ -7660,30 +7971,30 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp32_ = NULL;
 	gboolean _tmp33_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (response_body != NULL);
-#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1108: ACTION: extracting username from body of server" \
+#line 1118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	g_debug ("RESTSupport.vala:1118: ACTION: extracting username from body of server" \
 " response");
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = json_parser_new ();
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	parser = _tmp0_;
-#line 7659 "RESTSupport.c"
+#line 7963 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = parser;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = response_body;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7671 "RESTSupport.c"
+#line 7975 "RESTSupport.c"
 			goto __catch8_g_error;
 		}
 	}
@@ -7698,177 +8009,177 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = self->priv->host;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = err;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (_tmp9_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp7_);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (parser);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7716 "RESTSupport.c"
+#line 8020 "RESTSupport.c"
 	}
 	__finally8:
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (parser);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7729 "RESTSupport.c"
+#line 8033 "RESTSupport.c"
 	}
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = json_node_get_object (_tmp11_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	response_obj = _tmp13_;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = response_obj;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = json_object_has_member (_tmp14_, "name");
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp15_) {
-#line 7747 "RESTSupport.c"
+#line 8051 "RESTSupport.c"
 		gchar* username = NULL;
 		JsonObject* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp16_ = response_obj;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp17_ = json_object_get_string_member (_tmp16_, "name");
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = g_strdup (_tmp17_);
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		username = _tmp18_;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = username;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 7765 "RESTSupport.c"
+#line 8069 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
 			const gchar* _tmp21_ = NULL;
 			gchar* _tmp22_ = NULL;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp20_ = self->priv->session;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp21_ = username;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp22_ = g_strdup (_tmp21_);
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp20_->user_name);
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp20_->user_name = _tmp22_;
-#line 7779 "RESTSupport.c"
+#line 8083 "RESTSupport.c"
 		}
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (username);
-#line 7783 "RESTSupport.c"
+#line 8087 "RESTSupport.c"
 	}
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = response_obj;
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = json_object_has_member (_tmp23_, "access_token");
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp24_) {
-#line 7791 "RESTSupport.c"
+#line 8095 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp25_ = response_obj;
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp26_ = json_object_get_string_member (_tmp25_, "access_token");
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_strdup (_tmp26_);
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		access_token = _tmp27_;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp28_ = access_token;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 7809 "RESTSupport.c"
+#line 8113 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp29_ = self->priv->session;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp30_ = access_token;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp31_ = g_strdup (_tmp30_);
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp29_->access_token);
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp29_->access_token = _tmp31_;
-#line 7823 "RESTSupport.c"
+#line 8127 "RESTSupport.c"
 		}
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 7827 "RESTSupport.c"
+#line 8131 "RESTSupport.c"
 	}
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = self->priv->session;
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp33_, "session.is_authenticated()");
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_login_flow_complete (self);
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_json_object_unref0 (response_obj);
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (parser);
-#line 7841 "RESTSupport.c"
+#line 8145 "RESTSupport.c"
 }
 
 
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 7856 "RESTSupport.c"
+#line 8160 "RESTSupport.c"
 }
 
 
@@ -7876,177 +8187,177 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	PublishingRESTSupportGoogleSession* result = NULL;
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 1147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->session;
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 7874 "RESTSupport.c"
+#line 8178 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSupportGooglePublisher* self, const gchar* refresh_token) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = refresh_token;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 7887 "RESTSupport.c"
+#line 8191 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = refresh_token;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 7893 "RESTSupport.c"
+#line 8197 "RESTSupport.c"
 	} else {
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = FALSE;
-#line 7897 "RESTSupport.c"
+#line 8201 "RESTSupport.c"
 	}
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 7901 "RESTSupport.c"
+#line 8205 "RESTSupport.c"
 		PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = self->priv->session;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = refresh_token;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp3_->refresh_token);
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_->refresh_token = _tmp5_;
-#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 7917 "RESTSupport.c"
+#line 8221 "RESTSupport.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
-#line 1156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
-#line 1156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 7924 "RESTSupport.c"
+#line 8228 "RESTSupport.c"
 			SpitPublishingPluginHost* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = self->priv->host;
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_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 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 7935 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
 		}
-#line 1161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 7939 "RESTSupport.c"
+#line 8243 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 7949 "RESTSupport.c"
+#line 8253 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 7958 "RESTSupport.c"
+#line 8262 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 7967 "RESTSupport.c"
+#line 8271 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 7976 "RESTSupport.c"
+#line 8280 "RESTSupport.c"
 }
 
 
 static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 7985 "RESTSupport.c"
+#line 8289 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 7994 "RESTSupport.c"
+#line 8298 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8003 "RESTSupport.c"
+#line 8307 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8012 "RESTSupport.c"
+#line 8316 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8021 "RESTSupport.c"
+#line 8325 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8030 "RESTSupport.c"
+#line 8334 "RESTSupport.c"
 }
 
 
@@ -8055,46 +8366,46 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->service;
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8049 "RESTSupport.c"
+#line 8353 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 706 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 706 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8071 "RESTSupport.c"
+#line 8375 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8078 "RESTSupport.c"
+#line 8382 "RESTSupport.c"
 }
 
 
@@ -8102,15 +8413,15 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->access_token;
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_ != NULL;
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8094 "RESTSupport.c"
+#line 8398 "RESTSupport.c"
 }
 
 
@@ -8120,21 +8431,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 715 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->user_name;
-#line 715 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != NULL, "user_name != null");
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->user_name;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8118 "RESTSupport.c"
+#line 8422 "RESTSupport.c"
 }
 
 
@@ -8144,21 +8455,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->access_token;
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8142 "RESTSupport.c"
+#line 8446 "RESTSupport.c"
 }
 
 
@@ -8168,60 +8479,60 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->refresh_token;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != NULL, "refresh_token != null");
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->refresh_token;
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8166 "RESTSupport.c"
+#line 8470 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 729 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 730 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 730 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 8186 "RESTSupport.c"
+#line 8490 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_google_session_impl_parent_class = g_type_class_peek_parent (klass);
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8205 "RESTSupport.c"
+#line 8509 "RESTSupport.c"
 }
 
 
@@ -8231,17 +8542,17 @@ static void publishing_rest_support_google_publisher_google_session_impl_instanc
 
 static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 700 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8225 "RESTSupport.c"
+#line 8529 "RESTSupport.c"
 }
 
 
@@ -8257,115 +8568,38 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
 }
 
 
-static void _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed ((PublishingRESTSupportGooglePublisherWebAuthenticationPane*) self, load_event);
-#line 8244 "RESTSupport.c"
-}
-
-
-static gboolean __lambda4_ (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
-	gboolean result = FALSE;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = FALSE;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8254 "RESTSupport.c"
-}
-
-
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
-	gboolean result;
-	result = __lambda4_ ((PublishingRESTSupportGooglePublisherWebAuthenticationPane*) self);
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8263 "RESTSupport.c"
-}
-
-
 static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
 	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self = NULL;
 	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	WebKitWebView* _tmp3_ = NULL;
-	WebKitWebView* _tmp4_ = NULL;
-	WebKitSettings* _tmp5_ = NULL;
-	WebKitWebView* _tmp6_ = NULL;
-	WebKitWebView* _tmp7_ = NULL;
-	GtkBox* _tmp8_ = NULL;
-	WebKitWebView* _tmp9_ = NULL;
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, NULL);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = auth_sequence_start_url;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (self->priv->auth_sequence_start_url);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->auth_sequence_start_url = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_object_ref_sink (_tmp2_);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->pane_widget = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = (WebKitWebView*) webkit_web_view_new ();
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_object_ref_sink (_tmp3_);
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->webview = _tmp3_;
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = self->priv->webview;
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = webkit_web_view_get_settings (_tmp4_);
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	webkit_settings_set_enable_plugins (_tmp5_, FALSE);
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = self->priv->webview;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (_tmp6_, "load-changed", (GCallback) _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = self->priv->webview;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (_tmp7_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = self->priv->pane_widget;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp9_ = self->priv->webview;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8329 "RESTSupport.c"
+#line 8556 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8336 "RESTSupport.c"
+#line 8563 "RESTSupport.c"
 }
 
 
 static gboolean publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8349 "RESTSupport.c"
+#line 8576 "RESTSupport.c"
 }
 
 
@@ -8392,7 +8626,7 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	_tmp3_ = _result_;
 #line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 8376 "RESTSupport.c"
+#line 8603 "RESTSupport.c"
 		gchar* _tmp4_ = NULL;
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -8400,13 +8634,13 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8384 "RESTSupport.c"
+#line 8611 "RESTSupport.c"
 	} else {
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8390 "RESTSupport.c"
+#line 8617 "RESTSupport.c"
 	}
 }
 
@@ -8430,7 +8664,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8414 "RESTSupport.c"
+#line 8641 "RESTSupport.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -8438,7 +8672,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8422 "RESTSupport.c"
+#line 8649 "RESTSupport.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -8450,7 +8684,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8434 "RESTSupport.c"
+#line 8661 "RESTSupport.c"
 	}
 }
 
@@ -8474,21 +8708,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8458 "RESTSupport.c"
+#line 8685 "RESTSupport.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8464 "RESTSupport.c"
+#line 8691 "RESTSupport.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8468 "RESTSupport.c"
+#line 8695 "RESTSupport.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8472 "RESTSupport.c"
+#line 8699 "RESTSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -8500,7 +8734,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8484 "RESTSupport.c"
+#line 8711 "RESTSupport.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -8510,13 +8744,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8494 "RESTSupport.c"
+#line 8721 "RESTSupport.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8500 "RESTSupport.c"
+#line 8727 "RESTSupport.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -8530,7 +8764,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8514 "RESTSupport.c"
+#line 8741 "RESTSupport.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -8540,13 +8774,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8524 "RESTSupport.c"
+#line 8751 "RESTSupport.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8530 "RESTSupport.c"
+#line 8757 "RESTSupport.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8555,7 +8789,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8539 "RESTSupport.c"
+#line 8766 "RESTSupport.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -8575,265 +8809,116 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8559 "RESTSupport.c"
+#line 8786 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
+static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
 	gchar* page_title = NULL;
-	WebKitWebView* _tmp4_ = NULL;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = _tmp2_;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (_tmp3_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = self->priv->webview;
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = webkit_web_view_get_title (_tmp4_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	page_title = _tmp6_;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = page_title;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = string_index_of (_tmp7_, "state=connect", 0);
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp8_ > 0) {
-#line 8602 "RESTSupport.c"
+	gint _tmp6_ = 0;
+#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp1_ = _tmp0_;
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp2_ = webkit_web_view_get_title (_tmp1_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp4_ = _tmp3_;
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_object_unref0 (_tmp1_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	page_title = _tmp4_;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp5_ = page_title;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (_tmp6_ > 0) {
+#line 8822 "RESTSupport.c"
 		gint auth_code_field_start = 0;
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
+		const gchar* _tmp7_ = NULL;
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
 		gchar* auth_code = NULL;
-		const gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp9_ = page_title;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp10_ = string_index_of (_tmp9_, "code=", 0);
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		auth_code_field_start = _tmp10_;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp11_ = auth_code_field_start;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (_tmp11_ < 0) {
-#line 770 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		const gchar* _tmp10_ = NULL;
+		gint _tmp11_ = 0;
+		gchar* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp7_ = page_title;
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp8_ = string_index_of (_tmp7_, "code=", 0);
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		auth_code_field_start = _tmp8_;
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp9_ = auth_code_field_start;
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		if (_tmp9_ < 0) {
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (page_title);
-#line 770 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 8626 "RESTSupport.c"
+#line 8846 "RESTSupport.c"
 		}
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp12_ = page_title;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp13_ = auth_code_field_start;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp14_ = string_substring (_tmp12_, (glong) (_tmp13_ + 5), (glong) -1);
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		auth_code = _tmp14_;
-#line 775 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp10_ = page_title;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp11_ = auth_code_field_start;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		auth_code = _tmp12_;
+#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = TRUE;
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp15_ = auth_code;
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_signal_emit_by_name (self, "authorized", _tmp15_);
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp13_ = auth_code;
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_signal_emit_by_name (self, "authorized", _tmp13_);
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (auth_code);
-#line 8644 "RESTSupport.c"
-	}
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (page_title);
-#line 8648 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = _tmp2_;
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (_tmp3_);
-#line 8671 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self, WebKitLoadEvent load_event) {
-	WebKitLoadEvent _tmp0_ = 0;
-#line 785 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = load_event;
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	switch (_tmp0_) {
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		case WEBKIT_LOAD_STARTED:
-#line 8685 "RESTSupport.c"
-		{
-#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (self);
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			break;
-#line 8691 "RESTSupport.c"
-		}
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		case WEBKIT_LOAD_FINISHED:
-#line 8695 "RESTSupport.c"
-		{
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (self);
-#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			break;
-#line 8701 "RESTSupport.c"
-		}
-		default:
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		break;
-#line 8706 "RESTSupport.c"
+#line 8864 "RESTSupport.c"
 	}
-#line 795 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return;
-#line 8710 "RESTSupport.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8723 "RESTSupport.c"
-}
-
-
-static GtkWidget* publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 802 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = _tmp1_;
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8742 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-	WebKitWebView* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->webview;
 #line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->priv->auth_sequence_start_url;
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	webkit_web_view_load_uri (_tmp0_, _tmp1_);
-#line 8758 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 8766 "RESTSupport.c"
+	_g_free0 (page_title);
+#line 8868 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_web_authentication_pane_class_init (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass * klass) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate));
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load;
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8779 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled;
-#line 8794 "RESTSupport.c"
+#line 8881 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_web_authentication_pane_instance_init (PublishingRESTSupportGooglePublisherWebAuthenticationPane * self) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 8801 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj) {
 	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (self->priv->auth_sequence_start_url);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8817 "RESTSupport.c"
+#line 8895 "RESTSupport.c"
 }
 
 
@@ -8841,10 +8926,8 @@ static GType publishing_rest_support_google_publisher_web_authentication_pane_ge
 	static volatile gsize publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_rest_support_google_publisher_web_authentication_pane_type_id;
-		publishing_rest_support_google_publisher_web_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingRESTSupportGooglePublisherWebAuthenticationPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_rest_support_google_publisher_web_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_rest_support_google_publisher_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingRESTSupportGooglePublisherWebAuthenticationPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile, publishing_rest_support_google_publisher_web_authentication_pane_type_id);
 	}
 	return publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile;
@@ -8855,43 +8938,43 @@ static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishin
 	PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* self = NULL;
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (auth_code != NULL, NULL);
-#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 820 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = auth_code;
-#line 820 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
-#line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 823 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
-#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8861 "RESTSupport.c"
+#line 8937 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8868 "RESTSupport.c"
+#line 8944 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8875 "RESTSupport.c"
+#line 8951 "RESTSupport.c"
 }
 
 
@@ -8917,45 +9000,45 @@ static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publis
 	PublishingRESTSupportSession* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = session;
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishing_rest_support_google_session_get_refresh_token (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp3_);
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp3_);
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8925 "RESTSupport.c"
+#line 9001 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 8932 "RESTSupport.c"
+#line 9008 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8939 "RESTSupport.c"
+#line 9015 "RESTSupport.c"
 }
 
 
@@ -8980,28 +9063,28 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8978 "RESTSupport.c"
+#line 9054 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 8985 "RESTSupport.c"
+#line 9061 "RESTSupport.c"
 }
 
 
@@ -9017,57 +9100,57 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = session;
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp4_, "session.is_authenticated()");
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = session;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9037 "RESTSupport.c"
+#line 9113 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9044 "RESTSupport.c"
+#line 9120 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
-#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9051 "RESTSupport.c"
+#line 9127 "RESTSupport.c"
 }
 
 
@@ -9090,29 +9173,29 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
 static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
 	PublishingRESTSupportGooglePublisherUsernameFetchTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9082 "RESTSupport.c"
+#line 9158 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9089 "RESTSupport.c"
+#line 9165 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
-#line 856 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9096 "RESTSupport.c"
+#line 9172 "RESTSupport.c"
 }
 
 
@@ -9133,61 +9216,61 @@ static GType publishing_rest_support_google_publisher_username_fetch_transaction
 
 
 static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_rest_support_google_publisher_real_on_login_flow_complete;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_rest_support_google_publisher_real_do_logout;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_rest_support_google_publisher_real_is_running;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_rest_support_google_publisher_real_start;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9133 "RESTSupport.c"
+#line 9209 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_is_running;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_start;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9148 "RESTSupport.c"
+#line 9224 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9155 "RESTSupport.c"
+#line 9231 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
 	PublishingRESTSupportGooglePublisher * self;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->web_auth_pane);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9171 "RESTSupport.c"
+#line 9247 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 838192e..1a9052b 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -33,7 +33,7 @@ public abstract class Session {
 
     public Session(string? endpoint_url = null) {
         this.endpoint_url = endpoint_url;
-        soup_session = new Soup.SessionAsync();
+        soup_session = new Soup.Session ();
         this.soup_session.ssl_use_system_ca_file = true;
     }
     
@@ -73,6 +73,11 @@ public abstract class Session {
         
         soup_session.request_unqueued.disconnect(notify_wire_message_unqueued);
     }
+
+    public void set_insecure () {
+        this.soup_session.ssl_use_system_ca_file = false;
+        this.soup_session.ssl_strict = false;
+    }
 }
 
 public enum HttpMethod {
@@ -186,6 +191,59 @@ public class Transaction {
         }
     }
 
+    /* Texts copied from epiphany */
+    public string detailed_error_from_tls_flags (out TlsCertificate cert) {
+        TlsCertificateFlags tls_errors;
+        this.message.get_https_status (out cert, out tls_errors);
+
+        var list = new Gee.ArrayList<string> ();
+        if (TlsCertificateFlags.BAD_IDENTITY in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website presented identification that belongs to a different website."));
+        }
+
+        if (TlsCertificateFlags.EXPIRED in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification is too old to trust. Check the date on your computer’s calendar."));
+        }
+
+        if (TlsCertificateFlags.UNKNOWN_CA in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification was not issued by a trusted organization."));
+        }
+
+        if (TlsCertificateFlags.GENERIC_ERROR in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification could not be processed. It may be corrupted."));
+        }
+
+        if (TlsCertificateFlags.REVOKED in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification has been revoked by the trusted organization that issued it."));
+        }
+
+        if (TlsCertificateFlags.INSECURE in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification cannot be trusted because it uses very weak encryption."));
+        }
+
+        if (TlsCertificateFlags.NOT_ACTIVATED in tls_errors) {
+            /* Possible error message when a site presents a bad certificate. */
+            list.add (_("⚫ This website’s identification is only valid for future dates. Check the date on your computer’s calendar."));
+        }
+
+        var builder = new StringBuilder ();
+        if (list.size == 1) {
+            builder.append (list.get (0));
+        } else {
+            foreach (var entry in list) {
+                builder.append_printf ("%s\n", entry);
+            }
+        }
+
+        return builder.str;
+  }
+
     protected void check_response(Soup.Message message) throws Spit.Publishing.PublishingError {
         switch (message.status_code) {
             case Soup.KnownStatusCode.OK:
@@ -733,37 +791,21 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
         }
     }
     
-    private class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
+    private class WebAuthenticationPane : Shotwell.Plugins.Common.WebAuthenticationPane {
         public static bool cache_dirty = false;
         
-        private WebKit.WebView webview;
-        private Gtk.Box pane_widget;
-        private string auth_sequence_start_url;
-
         public signal void authorized(string auth_code);
 
         public WebAuthenticationPane(string auth_sequence_start_url) {
-            this.auth_sequence_start_url = auth_sequence_start_url;
-
-            pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
-            webview = new WebKit.WebView();
-            webview.get_settings().enable_plugins = false;
-
-            webview.load_changed.connect(on_page_load_changed);
-            webview.context_menu.connect(() => { return false; });
-
-            pane_widget.pack_start(webview, true, true, 0);
+            Object (login_uri : auth_sequence_start_url);
         }
         
         public static bool is_cache_dirty() {
             return cache_dirty;
         }
         
-        private void on_page_load() {
-            pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
-            
-            string page_title = webview.get_title();
+        public override void on_page_load() {
+            string page_title = get_view ().get_title();
             if (page_title.index_of("state=connect") > 0) {
                 int auth_code_field_start = page_title.index_of("code=");
                 if (auth_code_field_start < 0)
@@ -777,38 +819,6 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
                 authorized(auth_code);
             }
         }
-
-        private void on_load_started() {
-            pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
-        }
-
-        private void on_page_load_changed (WebKit.LoadEvent load_event) {
-            switch (load_event) {
-                case WebKit.LoadEvent.STARTED:
-                    on_load_started();
-                    break;
-                case WebKit.LoadEvent.FINISHED:
-                    on_page_load();
-                    break;
-            }
-
-            return;
-        }
-        
-        public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-            return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-        }
-        
-        public Gtk.Widget get_widget() {
-            return pane_widget;
-        }
-
-        public void on_pane_installed() {
-            webview.load_uri(auth_sequence_start_url);
-        }
-
-        public void on_pane_uninstalled() {
-        }
     }
     
     private class GetAccessTokensTransaction : Publishing.RESTSupport.Transaction {
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
new file mode 100644
index 0000000..e430441
--- /dev/null
+++ b/plugins/common/WebAuthenticationPane.c
@@ -0,0 +1,575 @@
+/* WebAuthenticationPane.c generated by valac 0.34.1, the Vala compiler
+ * generated from WebAuthenticationPane.vala, do not modify */
+
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <stdlib.h>
+#include <string.h>
+#include <webkit2/webkit2.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
+
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+struct _ShotwellPluginsCommonWebAuthenticationPane {
+	GObject parent_instance;
+	ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
+	GObjectClass parent_class;
+	void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPanePrivate {
+	SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
+	gchar* _login_uri;
+	WebKitWebView* webview;
+	GtkBox* pane_widget;
+};
+
+
+static gpointer shotwell_plugins_common_web_authentication_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface* shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate))
+enum  {
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY,
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI
+};
+static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base);
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event);
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self);
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
+static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value);
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj);
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+
+
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
+#line 88 "WebAuthenticationPane.c"
+}
+
+
+static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
+	gboolean result = FALSE;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = FALSE;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 98 "WebAuthenticationPane.c"
+}
+
+
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+	gboolean result;
+	result = __lambda4_ ((ShotwellPluginsCommonWebAuthenticationPane*) self);
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 107 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+	WebKitSettings* _tmp2_ = NULL;
+	WebKitWebView* _tmp3_ = NULL;
+	WebKitWebView* _tmp4_ = NULL;
+	GtkBox* _tmp5_ = NULL;
+	GtkBox* _tmp6_ = NULL;
+	WebKitWebView* _tmp7_ = NULL;
+#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 20 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = (WebKitWebView*) webkit_web_view_new ();
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_ref_sink (_tmp0_);
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (self->priv->webview);
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv->webview = _tmp0_;
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = self->priv->webview;
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp2_ = webkit_web_view_get_settings (_tmp1_);
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	webkit_settings_set_enable_plugins (_tmp2_, FALSE);
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp3_ = self->priv->webview;
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_signal_connect_object (_tmp3_, "load-changed", (GCallback) _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp4_ = self->priv->webview;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_signal_connect_object (_tmp4_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp5_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_ref_sink (_tmp5_);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv->pane_widget = _tmp5_;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp6_ = self->priv->pane_widget;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp7_ = self->priv->webview;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	gtk_box_pack_start (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 161 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_critical ("Type `%s' does not implement abstract method `shotwell_plugins_common_web_authentication_pane_on_page_load'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return;
+#line 170 "WebAuthenticationPane.c"
+}
+
+
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
+#line 179 "WebAuthenticationPane.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 186 "WebAuthenticationPane.c"
+}
+
+
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
+	GdkWindow* window = NULL;
+	GtkBox* _tmp0_ = NULL;
+	GdkWindow* _tmp1_ = NULL;
+	GdkWindow* _tmp2_ = NULL;
+	GdkDisplay* display = NULL;
+	GdkDisplay* _tmp3_ = NULL;
+	GdkDisplay* _tmp4_ = NULL;
+	GdkCursor* cursor = NULL;
+	GdkCursorType _tmp5_ = 0;
+	GdkCursor* _tmp6_ = NULL;
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->pane_widget;
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	window = _tmp2_;
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp3_ = gdk_window_get_display (window);
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	display = _tmp4_;
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp5_ = type;
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	cursor = _tmp6_;
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	gdk_window_set_cursor (window, cursor);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (cursor);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (display);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (window);
+#line 231 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
+	WebKitLoadEvent _tmp0_ = 0;
+#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = load_event;
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	switch (_tmp0_) {
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case WEBKIT_LOAD_STARTED:
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case WEBKIT_LOAD_REDIRECTED:
+#line 247 "WebAuthenticationPane.c"
+		{
+#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
+#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			break;
+#line 253 "WebAuthenticationPane.c"
+		}
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case WEBKIT_LOAD_FINISHED:
+#line 257 "WebAuthenticationPane.c"
+		{
+#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
+#line 49 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			shotwell_plugins_common_web_authentication_pane_on_page_load (self);
+#line 50 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			break;
+#line 265 "WebAuthenticationPane.c"
+		}
+		default:
+		{
+#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+			break;
+#line 271 "WebAuthenticationPane.c"
+		}
+	}
+}
+
+
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) {
+	WebKitWebView* result = NULL;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->webview;
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = _tmp1_;
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 291 "WebAuthenticationPane.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->_preferred_geometry;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = _tmp0_;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 307 "WebAuthenticationPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	GtkWidget* result = NULL;
+	GtkBox* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->pane_widget;
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = _tmp1_;
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 326 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (self);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = _tmp0_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp2_ = shotwell_plugins_common_web_authentication_pane_get_login_uri (self);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp3_ = _tmp2_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp4_ = _tmp3_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	webkit_web_view_load_uri (_tmp1_, _tmp4_);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_free0 (_tmp4_);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (_tmp1_);
+#line 355 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+#line 72 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 363 "WebAuthenticationPane.c"
+}
+
+
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type) {
+	ShotwellPluginsCommonWebAuthenticationPane * self = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return self;
+#line 373 "WebAuthenticationPane.c"
+}
+
+
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) {
+	SpitPublishingDialogPaneGeometryOptions result;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), 0);
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->_preferred_geometry;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 388 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = value;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_notify ((GObject *) self, "preferred-geometry");
+#line 402 "WebAuthenticationPane.c"
+}
+
+
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->_login_uri;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	result = _tmp1_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	return result;
+#line 420 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = value;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_free0 (self->priv->_login_uri);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv->_login_uri = _tmp1_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_notify ((GObject *) self, "login-uri");
+#line 439 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	shotwell_plugins_common_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonWebAuthenticationPanePrivate));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	((GObjectClass *) klass)->constructed = shotwell_plugins_common_web_authentication_pane_real_constructed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = shotwell_plugins_common_web_authentication_pane_real_on_page_load;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_web_authentication_pane_get_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_shotwell_plugins_common_web_authentication_pane_set_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 462 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
+#line 477 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
+#line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 486 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_free0 (self->priv->_login_uri);
+#line 16 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (self->priv->webview);
+#line 17 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
+#line 502 "WebAuthenticationPane.c"
+}
+
+
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
+	static volatile gsize shotwell_plugins_common_web_authentication_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&shotwell_plugins_common_web_authentication_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonWebAuthenticationPane), 0, (GInstanceInitFunc) shotwell_plugins_common_web_authentication_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType shotwell_plugins_common_web_authentication_pane_type_id;
+		shotwell_plugins_common_web_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "ShotwellPluginsCommonWebAuthenticationPane", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+		g_type_add_interface_static (shotwell_plugins_common_web_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&shotwell_plugins_common_web_authentication_pane_type_id__volatile, shotwell_plugins_common_web_authentication_pane_type_id);
+	}
+	return shotwell_plugins_common_web_authentication_pane_type_id__volatile;
+}
+
+
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		g_value_set_enum (value, shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 537 "WebAuthenticationPane.c"
+		default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 543 "WebAuthenticationPane.c"
+	}
+}
+
+
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	ShotwellPluginsCommonWebAuthenticationPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (self, g_value_get_enum (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 565 "WebAuthenticationPane.c"
+		default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		break;
+#line 571 "WebAuthenticationPane.c"
+	}
+}
+
+
+
diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
new file mode 100644
index 0000000..0a77cf6
--- /dev/null
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -0,0 +1,75 @@
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+using Spit.Publishing;
+
+namespace Shotwell.Plugins.Common {
+    public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
+        public DialogPane.GeometryOptions preferred_geometry {
+            get; construct; default = DialogPane.GeometryOptions.NONE;
+        }
+
+        public string login_uri { owned get; construct; }
+
+        private WebKit.WebView webview;
+        private Gtk.Box pane_widget;
+
+        public override void constructed () {
+            base.constructed ();
+
+            this.webview = new WebKit.WebView ();
+            this.webview.get_settings ().enable_plugins = false;
+
+            this.webview.load_changed.connect (this.on_page_load_changed);
+            this.webview.context_menu.connect ( () => { return false; });
+
+            this.pane_widget = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            this.pane_widget.pack_start (this.webview, true, true, 0);
+        }
+
+        public abstract void on_page_load ();
+
+        protected void set_cursor (Gdk.CursorType type) {
+            var window = pane_widget.get_window ();
+            var display = window.get_display ();
+            var cursor = new Gdk.Cursor.for_display (display, type);
+            window.set_cursor (cursor);
+        }
+
+        private void on_page_load_changed (WebKit.LoadEvent load_event) {
+            switch (load_event) {
+                case WebKit.LoadEvent.STARTED:
+                case WebKit.LoadEvent.REDIRECTED:
+                    this.set_cursor (Gdk.CursorType.WATCH);
+                    break;
+                case WebKit.LoadEvent.FINISHED:
+                    this.set_cursor (Gdk.CursorType.LEFT_PTR);
+                    this.on_page_load ();
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        public WebKit.WebView get_view () {
+            return this.webview;
+        }
+
+        public DialogPane.GeometryOptions get_preferred_geometry() {
+            return this.preferred_geometry;
+        }
+
+        public Gtk.Widget get_widget() {
+            return pane_widget;
+        }
+
+        public void on_pane_installed () {
+            this.get_view ().load_uri (this.login_uri);
+        }
+
+        public void on_pane_uninstalled() {
+        }
+   }
+}
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index f0e19f5..4cae37f 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -10,10 +10,12 @@
 #include <glib-object.h>
 #include <libsoup/soup.h>
 #include "shotwell-plugin-dev-1.0.h"
+#include <gio/gio.h>
 #include <gee.h>
 #include <libxml/tree.h>
-#include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <webkit2/webkit2.h>
 
 G_BEGIN_DECLS
 
@@ -119,6 +121,17 @@ typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransaction Pub
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass;
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate;
 
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+
 struct _PublishingRESTSupportSession {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -236,6 +249,16 @@ struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass {
 	PublishingRESTSupportTransactionClass parent_class;
 };
 
+struct _ShotwellPluginsCommonWebAuthenticationPane {
+	GObject parent_instance;
+	ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
+	GObjectClass parent_class;
+	void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
+};
+
 
 gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
 gpointer publishing_rest_support_session_ref (gpointer instance);
@@ -254,6 +277,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
 void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
 gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
 void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
 GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
 PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
@@ -280,6 +304,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (Publi
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert);
 void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
@@ -375,6 +400,13 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 #define RESOURCES_TRANSLATORS _ ("translator-credits")
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
 
 
 G_END_DECLS
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 8b1a0e1..f6213af 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -54,6 +54,7 @@ namespace Publishing {
 			protected void notify_authentication_failed (Spit.Publishing.PublishingError err);
 			protected void notify_wire_message_unqueued (Soup.Message message);
 			public void send_wire_message (Soup.Message message);
+			public void set_insecure ();
 			public void stop_transactions ();
 			public signal void authenticated ();
 			public signal void authentication_failed (Spit.Publishing.PublishingError err);
@@ -65,6 +66,7 @@ namespace Publishing {
 			public void add_argument (string name, string value);
 			protected virtual void add_header (string key, string value);
 			protected void check_response (Soup.Message message) throws Spit.Publishing.PublishingError;
+			public string detailed_error_from_tls_flags (out GLib.TlsCertificate cert);
 			public virtual void execute () throws Spit.Publishing.PublishingError;
 			public Publishing.RESTSupport.Argument[] get_arguments ();
 			public string? get_endpoint_url ();
@@ -137,3 +139,19 @@ namespace Resources {
 	[CCode (cheader_filename = "shotwell-plugin-common.h")]
 	public static Gdk.Pixbuf[]? load_icon_set (GLib.File? icon_file);
 }
+namespace Shotwell {
+	namespace Plugins {
+		namespace Common {
+			[CCode (cheader_filename = "shotwell-plugin-common.h")]
+			public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, GLib.Object {
+				public WebAuthenticationPane ();
+				public override void constructed ();
+				public WebKit.WebView get_view ();
+				public abstract void on_page_load ();
+				protected void set_cursor (Gdk.CursorType type);
+				public string login_uri { owned get; construct; }
+				public Spit.Publishing.DialogPane.GeometryOptions preferred_geometry { get; construct; }
+			}
+		}
+	}
+}
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 716b48e..f658eef 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.c
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.c
@@ -829,8 +829,8 @@ enum  {
 };
 #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG _ ("\n" \
 "\n" \
-"The file \"%s\" may not be supported by or may be too large for this i" \
-"nstance of Gallery3.")
+"The file “%s” may not be supported by or may be too large for this ins" \
+"tance of Gallery3.")
 #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG _ ("\n" \
 "Note that Gallery3 only supports the video types that Flowplayer does.")
 PublishingGallery3Session* publishing_gallery3_session_new (void);
@@ -7320,7 +7320,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = self->priv->host;
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can't " \
+		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
 "continue.");
 #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
@@ -11459,7 +11459,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp4_ = host;
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can't " \
+		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
 "continue.");
 #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
 		_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index ee7bd19..9932862 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -798,7 +798,7 @@ private class GalleryUploadTransaction :
 
 
 public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
-    private const string BAD_FILE_MSG = _("\n\nThe file \"%s\" may not be supported by or may be too large for this instance of Gallery3.");
+    private const string BAD_FILE_MSG = _("\n\nThe file “%s” may not be supported by or may be too large for this instance of Gallery3.");
     private const string BAD_MOVIE_MSG = _("\nNote that Gallery3 only supports the video types that Flowplayer does.");
 
     private weak Spit.Publishing.PluginHost host = null;
@@ -1018,7 +1018,7 @@ public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+                    _("A file required for publishing is unavailable. Publishing to %s can’t continue.")
                         .printf(SERVICE_NAME)
                 )
             );
@@ -1770,7 +1770,7 @@ internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+                    _("A file required for publishing is unavailable. Publishing to %s can’t continue.")
                         .printf(SERVICE_NAME)
                     )
                 );
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index 9ede44f..2888418 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -1035,7 +1035,7 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*info).authors = _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_tmp1_ = _ ("Copyright (C) 2013 rajce.net");
+	_tmp1_ = _ ("Copyright © 2013 rajce.net");
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6664,7 +6664,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp55_ = self->priv->login_button;
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp56_ = _ ("Login");
+		_tmp56_ = _ ("Log in");
 #line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_button_set_label (_tmp55_, _tmp56_);
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala b/plugins/shotwell-publishing-extras/RajcePublishing.vala
index 4cf232c..b304f13 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.vala
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala
@@ -37,7 +37,7 @@ public class RajceService : Object, Spit.Pluggable, Spit.Publishing.Service
     public void get_info(ref Spit.PluggableInfo info)
 	{
         info.authors = "rajce.net developers";
-        info.copyright = _("Copyright (C) 2013 rajce.net");
+        info.copyright = _("Copyright © 2013 rajce.net");
         info.translators = Resources.TRANSLATORS;
         info.version = _VERSION;
         info.website_name = Resources.WEBSITE_NAME;
@@ -892,7 +892,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object
 			label2.set_label(_("_Email address") );
 			label3.set_label(_("_Password") );
 			remember_checkbutton.set_label(_("_Remember") );
-			login_button.set_label(_("Login") );
+			login_button.set_label(_("Log in") );
 			
             username_entry.changed.connect(on_user_changed);
             password_entry.changed.connect(on_password_changed);
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index 71b6574..6dfaa9a 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -1604,7 +1604,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _ ("500 x 375 pixels");
+	_tmp2_ = _ ("500 × 375 pixels");
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = publishing_tumblr_size_entry_new (_tmp2_, 500);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1614,7 +1614,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = _result__length1;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _ ("1024 x 768 pixels");
+	_tmp5_ = _ ("1024 × 768 pixels");
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = publishing_tumblr_size_entry_new (_tmp5_, 1024);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1624,7 +1624,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7__length1 = _result__length1;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _ ("1280 x 853 pixels");
+	_tmp8_ = _ ("1280 × 853 pixels");
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp9_ = publishing_tumblr_size_entry_new (_tmp8_, 1280);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2452,7 +2452,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp10_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = _ ("'%s' isn't a valid response to an OAuth authentication request");
+					_tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2554,7 +2554,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp27_ = self->priv->host;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = _ ("'%s' isn't a valid response to an OAuth authentication request");
+		_tmp28_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp29_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp28_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3894,7 +3894,7 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish
 #line 3878 "TumblrPublishing.c"
 		const gchar* _tmp2_ = NULL;
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = _ ("TumblrPublisher: start( ): can't start; this publisher is not restarta" \
+		_tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
 "ble.");
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_error ("TumblrPublishing.vala:559: %s", _tmp2_);
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index 3f5a2ed..bc6fcec 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -102,12 +102,12 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private SizeEntry[] create_sizes() {
         SizeEntry[] result = new SizeEntry[0];
 
-        result += new SizeEntry(_("500 x 375 pixels"), 500);
-        result += new SizeEntry(_("1024 x 768 pixels"), 1024);
-        result += new SizeEntry(_("1280 x 853 pixels"), 1280);
+        result += new SizeEntry(_("500 × 375 pixels"), 500);
+        result += new SizeEntry(_("1024 × 768 pixels"), 1024);
+        result += new SizeEntry(_("1280 × 853 pixels"), 1280);
 //Larger images make no sense for Tumblr
-//        result += new SizeEntry(_("2048 x 1536 pixels"), 2048);
-//        result += new SizeEntry(_("4096 x 3072 pixels"), 4096);
+//        result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
+//        result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
 //        result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
 
         return result;
@@ -308,7 +308,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
             
             if (split_pair.length != 2)
                 host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                    _("'%s' isn't a valid response to an OAuth authentication request")));
+                    _("“%s” isn’t a valid response to an OAuth authentication request")));
 
             if (split_pair[0] == "oauth_token")
                 oauth_token = split_pair[1];
@@ -318,7 +318,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
         
         if (oauth_token == null || oauth_token_secret == null)
             host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                _("'%s' isn't a valid response to an OAuth authentication request")));
+                _("“%s” isn’t a valid response to an OAuth authentication request")));
         
         session.set_access_phase_credentials(oauth_token, oauth_token_secret);
     }
@@ -556,7 +556,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
             return;
         
         if (was_started)
-            error(_("TumblrPublisher: start( ): can't start; this publisher is not restartable."));
+            error(_("TumblrPublisher: start( ): can’t start; this publisher is not restartable."));
         
         debug("TumblrPublisher: starting interaction.");
         
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index d13a33b..93f4aeb 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -15,8 +15,8 @@
 #include <glib/gi18n-lib.h>
 #include "shotwell-plugin-common.h"
 #include <webkit2/webkit2.h>
-#include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include <gee.h>
 #include <libsoup/soup.h>
 #include <glib/gstdio.h>
@@ -82,9 +82,9 @@ typedef struct _PublishingYandexSessionPrivate PublishingYandexSessionPrivate;
 typedef struct _PublishingYandexWebAuthPane PublishingYandexWebAuthPane;
 typedef struct _PublishingYandexWebAuthPaneClass PublishingYandexWebAuthPaneClass;
 typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #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)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
 #define __vala_WebKitNavigationAction_free0(var) ((var == NULL) ? NULL : (var = (_vala_WebKitNavigationAction_free (var), NULL)))
 
@@ -177,20 +177,16 @@ struct _PublishingYandexSessionPrivate {
 };
 
 struct _PublishingYandexWebAuthPane {
-	GObject parent_instance;
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
 	PublishingYandexWebAuthPanePrivate * priv;
 };
 
 struct _PublishingYandexWebAuthPaneClass {
-	GObjectClass parent_class;
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
 };
 
 struct _PublishingYandexWebAuthPanePrivate {
-	WebKitWebView* webview;
-	GtkBox* pane_widget;
-	GtkScrolledWindow* webview_frame;
 	GRegex* re;
-	gchar* login_url;
 };
 
 struct _PublishingYandexPublishOptions {
@@ -283,7 +279,6 @@ static SpitPublishingServiceIface* yandex_service_spit_publishing_service_parent
 static gpointer publishing_yandex_transaction_parent_class = NULL;
 static gpointer publishing_yandex_session_parent_class = NULL;
 static gpointer publishing_yandex_web_auth_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_yandex_publish_options_parent_class = NULL;
 static gpointer publishing_yandex_publishing_options_pane_parent_class = NULL;
 static SpitPublishingDialogPaneIface* publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -339,20 +334,12 @@ enum  {
 };
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url);
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url);
-static void publishing_yandex_web_auth_pane_on_page_load_changed (PublishingYandexWebAuthPane* self, WebKitLoadEvent load_event);
-static void _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static void publishing_yandex_web_auth_pane_real_constructed (GObject* base);
 static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type);
 static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self);
-static gboolean __lambda4_ (PublishingYandexWebAuthPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
-static void publishing_yandex_web_auth_pane_on_page_load (PublishingYandexWebAuthPane* self);
+static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self);
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self);
-static void publishing_yandex_web_auth_pane_on_load_started (PublishingYandexWebAuthPane* self);
-static GtkWidget* publishing_yandex_web_auth_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_web_auth_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_yandex_web_auth_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_yandex_web_auth_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
 static void publishing_yandex_web_auth_pane_finalize (GObject* obj);
 gpointer publishing_yandex_publish_options_ref (gpointer instance);
 void publishing_yandex_publish_options_unref (gpointer instance);
@@ -475,7 +462,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 479 "YandexPublishing.c"
+#line 466 "YandexPublishing.c"
 }
 
 
@@ -488,7 +475,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.yandex-fotki";
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 492 "YandexPublishing.c"
+#line 479 "YandexPublishing.c"
 }
 
 
@@ -501,7 +488,7 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Yandex.Fotki";
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 505 "YandexPublishing.c"
+#line 492 "YandexPublishing.c"
 }
 
 
@@ -568,7 +555,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	_g_free0 ((*info).license);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).license = _tmp8_;
-#line 572 "YandexPublishing.c"
+#line 559 "YandexPublishing.c"
 }
 
 
@@ -589,7 +576,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 593 "YandexPublishing.c"
+#line 580 "YandexPublishing.c"
 }
 
 
@@ -602,7 +589,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 606 "YandexPublishing.c"
+#line 593 "YandexPublishing.c"
 }
 
 
@@ -610,7 +597,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
 	YandexService * self;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 614 "YandexPublishing.c"
+#line 601 "YandexPublishing.c"
 }
 
 
@@ -620,21 +607,21 @@ YandexService* yandex_service_construct (GType object_type) {
 	self = (YandexService*) g_object_new (object_type, NULL);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 624 "YandexPublishing.c"
+#line 611 "YandexPublishing.c"
 }
 
 
 YandexService* yandex_service_new (void) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 631 "YandexPublishing.c"
+#line 618 "YandexPublishing.c"
 }
 
 
 static void yandex_service_class_init (YandexServiceClass * klass) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 638 "YandexPublishing.c"
+#line 625 "YandexPublishing.c"
 }
 
 
@@ -651,7 +638,7 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation;
-#line 655 "YandexPublishing.c"
+#line 642 "YandexPublishing.c"
 }
 
 
@@ -662,7 +649,7 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media;
-#line 666 "YandexPublishing.c"
+#line 653 "YandexPublishing.c"
 }
 
 
@@ -707,14 +694,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
 	publishing_yandex_transaction_add_headers (self);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 711 "YandexPublishing.c"
+#line 698 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 718 "YandexPublishing.c"
+#line 705 "YandexPublishing.c"
 }
 
 
@@ -737,7 +724,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp3_) {
-#line 741 "YandexPublishing.c"
+#line 728 "YandexPublishing.c"
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		PublishingYandexSession* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -766,7 +753,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 		_publishing_rest_support_session_unref0 (_tmp5_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 770 "YandexPublishing.c"
+#line 757 "YandexPublishing.c"
 	}
 }
 
@@ -787,14 +774,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
 	publishing_yandex_transaction_add_headers (self);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 791 "YandexPublishing.c"
+#line 778 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 798 "YandexPublishing.c"
+#line 785 "YandexPublishing.c"
 }
 
 
@@ -813,14 +800,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
 	_tmp1_ = type;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 817 "YandexPublishing.c"
+#line 804 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 824 "YandexPublishing.c"
+#line 811 "YandexPublishing.c"
 }
 
 
@@ -846,14 +833,14 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
 	self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 850 "YandexPublishing.c"
+#line 837 "YandexPublishing.c"
 }
 
 
 PublishingYandexSession* publishing_yandex_session_new (void) {
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 857 "YandexPublishing.c"
+#line 844 "YandexPublishing.c"
 }
 
 
@@ -869,7 +856,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
 	result = _tmp0_ != NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 873 "YandexPublishing.c"
+#line 860 "YandexPublishing.c"
 }
 
 
@@ -880,7 +867,7 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
 	_g_free0 (self->priv->auth_token);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 884 "YandexPublishing.c"
+#line 871 "YandexPublishing.c"
 }
 
 
@@ -899,7 +886,7 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
 	_g_free0 (self->priv->auth_token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = _tmp1_;
-#line 903 "YandexPublishing.c"
+#line 890 "YandexPublishing.c"
 }
 
 
@@ -917,7 +904,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
 	result = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 921 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
 }
 
 
@@ -930,7 +917,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
 	g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated;
-#line 934 "YandexPublishing.c"
+#line 921 "YandexPublishing.c"
 }
 
 
@@ -939,7 +926,7 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
 	self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 943 "YandexPublishing.c"
+#line 930 "YandexPublishing.c"
 }
 
 
@@ -951,7 +938,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->auth_token);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 955 "YandexPublishing.c"
+#line 942 "YandexPublishing.c"
 }
 
 
@@ -967,279 +954,167 @@ GType publishing_yandex_session_get_type (void) {
 }
 
 
-static void _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_web_auth_pane_on_page_load_changed ((PublishingYandexWebAuthPane*) self, load_event);
-#line 974 "YandexPublishing.c"
-}
-
-
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
-	gboolean result;
-	result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return result;
-#line 983 "YandexPublishing.c"
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
+	PublishingYandexWebAuthPane * self = NULL;
+	const gchar* _tmp0_ = NULL;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_return_val_if_fail (login_url != NULL, NULL);
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	_tmp0_ = login_url;
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	return self;
+#line 969 "YandexPublishing.c"
 }
 
 
-static gboolean __lambda4_ (PublishingYandexWebAuthPane* self) {
-	gboolean result = FALSE;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	result = FALSE;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return result;
-#line 993 "YandexPublishing.c"
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
+#line 976 "YandexPublishing.c"
 }
 
 
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
 	gboolean result;
-	result = __lambda4_ ((PublishingYandexWebAuthPane*) self);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1002 "YandexPublishing.c"
+#line 985 "YandexPublishing.c"
 }
 
 
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
-	PublishingYandexWebAuthPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	GtkBox* _tmp7_ = NULL;
-	GtkScrolledWindow* _tmp8_ = NULL;
-	GtkScrolledWindow* _tmp9_ = NULL;
-	GtkScrolledWindow* _tmp10_ = NULL;
-	WebKitWebView* _tmp11_ = NULL;
-	WebKitWebView* _tmp12_ = NULL;
-	WebKitSettings* _tmp13_ = NULL;
-	WebKitWebView* _tmp14_ = NULL;
-	WebKitWebView* _tmp15_ = NULL;
-	WebKitWebView* _tmp16_ = NULL;
-	GtkScrolledWindow* _tmp17_ = NULL;
-	WebKitWebView* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkScrolledWindow* _tmp20_ = NULL;
+static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
+	PublishingYandexWebAuthPane * self;
+	WebKitWebView* _tmp3_ = NULL;
+	WebKitWebView* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_return_val_if_fail (login_url != NULL, NULL);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, NULL);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = login_url;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (self->priv->login_url);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->login_url = _tmp1_;
-#line 1037 "YandexPublishing.c"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
+#line 996 "YandexPublishing.c"
 	{
+		GRegex* _tmp0_ = NULL;
+		GRegex* _tmp1_ = NULL;
 		GRegex* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp3_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp2_ = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_tmp1_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_tmp0_ = _tmp1_;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1050 "YandexPublishing.c"
+#line 1009 "YandexPublishing.c"
 				goto __catch39_g_regex_error;
 			}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			return NULL;
-#line 1059 "YandexPublishing.c"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			return;
+#line 1018 "YandexPublishing.c"
 		}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp4_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp2_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_tmp2_ = _tmp0_;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_tmp0_ = NULL;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_regex_unref0 (self->priv->re);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		self->priv->re = _tmp4_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_regex_unref0 (_tmp2_);
-#line 1071 "YandexPublishing.c"
+		self->priv->re = _tmp2_;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_g_regex_unref0 (_tmp0_);
+#line 1030 "YandexPublishing.c"
 	}
 	goto __finally39;
 	__catch39_g_regex_error:
 	{
 		GError* e = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp5_ = e;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = _tmp5_->message;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_critical ("YandexPublishing.vala:112: %s", _tmp6_);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		g_assert_not_reached ();
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1091 "YandexPublishing.c"
+#line 1044 "YandexPublishing.c"
 	}
 	__finally39:
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		return NULL;
-#line 1102 "YandexPublishing.c"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		return;
+#line 1055 "YandexPublishing.c"
 	}
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_object_ref_sink (_tmp7_);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->pane_widget = _tmp7_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp8_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_object_ref_sink (_tmp8_);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->webview_frame);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->webview_frame = _tmp8_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp9_ = self->priv->webview_frame;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gtk_scrolled_window_set_shadow_type (_tmp9_, GTK_SHADOW_ETCHED_IN);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp10_ = self->priv->webview_frame;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gtk_scrolled_window_set_policy (_tmp10_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp11_ = (WebKitWebView*) webkit_web_view_new ();
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_object_ref_sink (_tmp11_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->webview = _tmp11_;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp12_ = self->priv->webview;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp13_ = webkit_web_view_get_settings (_tmp12_);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	webkit_settings_set_enable_plugins (_tmp13_, FALSE);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp14_ = self->priv->webview;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_connect_object (_tmp14_, "load-changed", (GCallback) _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp15_ = self->priv->webview;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_connect_object (_tmp15_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp16_ = self->priv->webview;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_connect_object (_tmp16_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp17_ = self->priv->webview_frame;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp18_ = self->priv->webview;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp19_ = self->priv->pane_widget;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp20_ = self->priv->webview_frame;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return self;
-#line 1168 "YandexPublishing.c"
-}
-
-
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 1175 "YandexPublishing.c"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	_g_object_unref0 (_tmp4_);
+#line 1065 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_on_page_load (PublishingYandexWebAuthPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1198 "YandexPublishing.c"
+static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingYandexWebAuthPane * self;
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
+#line 1073 "YandexPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1205 "YandexPublishing.c"
+#line 1080 "YandexPublishing.c"
 }
 
 
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1212 "YandexPublishing.c"
+#line 1087 "YandexPublishing.c"
 }
 
 
 static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1219 "YandexPublishing.c"
+#line 1094 "YandexPublishing.c"
 }
 
 
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1226 "YandexPublishing.c"
+#line 1101 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
 	gboolean result = FALSE;
 	WebKitPolicyDecisionType _tmp0_ = 0;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (WEBKIT_IS_POLICY_DECISION (decision), FALSE);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = type;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	switch (_tmp0_) {
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1243 "YandexPublishing.c"
+#line 1118 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
 			WebKitPolicyDecision* _tmp1_ = NULL;
@@ -1261,54 +1136,54 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			const gchar* _tmp14_ = NULL;
 			GMatchInfo* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
-			WebKitPolicyDecision* _tmp32_ = NULL;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			WebKitPolicyDecision* _tmp28_ = NULL;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp1_ = decision;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			n_decision = _tmp2_;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp3_ = n_decision;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp4_ = webkit_navigation_policy_decision_get_navigation_action (_tmp3_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp5_ = _tmp4_;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp6_ = __vala_WebKitNavigationAction_copy0 (_tmp5_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			action = _tmp6_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp7_ = action;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp8_ = webkit_navigation_action_get_request (_tmp7_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp9_ = webkit_uri_request_get_uri (_tmp8_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp10_ = _tmp9_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			uri = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp12_ = uri;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			g_debug ("YandexPublishing.vala:143: Navigating to '%s'", _tmp12_);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp12_);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			info = NULL;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp13_ = self->priv->re;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp14_ = uri;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp16_ = g_regex_match (_tmp13_, _tmp14_, 0, &_tmp15_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_match_info_unref0 (info);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			info = _tmp15_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_tmp16_) {
-#line 1312 "YandexPublishing.c"
+#line 1187 "YandexPublishing.c"
 				gchar* access_token = NULL;
 				GMatchInfo* _tmp17_ = NULL;
 				gchar** _tmp18_ = NULL;
@@ -1319,243 +1194,111 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 				gchar* _tmp22_ = NULL;
 				gchar* _tmp23_ = NULL;
 				const gchar* _tmp24_ = NULL;
-				GtkBox* _tmp25_ = NULL;
-				GdkWindow* _tmp26_ = NULL;
-				GdkCursor* _tmp27_ = NULL;
-				GdkCursor* _tmp28_ = NULL;
-				const gchar* _tmp29_ = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+				const gchar* _tmp25_ = NULL;
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp17_ = info;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _tmp18_ = g_match_info_fetch_all (_tmp17_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp20_ = _tmp19_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp20__length1 = _vala_array_length (_tmp18_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp21_ = _tmp20_[2];
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp22_ = g_strdup (_tmp21_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp23_ = _tmp22_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_free), NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				access_token = _tmp23_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp24_ = access_token;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				g_debug ("YandexPublishing.vala:150: Load completed: %s", _tmp24_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp25_ = self->priv->pane_widget;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp26_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp27_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp28_ = _tmp27_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				gdk_window_set_cursor (_tmp26_, _tmp28_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_g_object_unref0 (_tmp28_);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				_tmp29_ = access_token;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-				if (_tmp29_ != NULL) {
-#line 1366 "YandexPublishing.c"
-					const gchar* _tmp30_ = NULL;
-					WebKitPolicyDecision* _tmp31_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp30_ = access_token;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit_by_name (self, "login-succeeded", _tmp30_);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					_tmp31_ = decision;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					webkit_policy_decision_ignore (_tmp31_);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+				g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp24_);
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+				shotwell_plugins_common_web_authentication_pane_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), GDK_LEFT_PTR);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+				_tmp25_ = access_token;
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+				if (_tmp25_ != NULL) {
+#line 1227 "YandexPublishing.c"
+					const gchar* _tmp26_ = NULL;
+					WebKitPolicyDecision* _tmp27_ = NULL;
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+					_tmp26_ = access_token;
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+					g_signal_emit_by_name (self, "login-succeeded", _tmp26_);
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+					_tmp27_ = decision;
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+					webkit_policy_decision_ignore (_tmp27_);
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (access_token);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_match_info_unref0 (info);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (uri);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					__vala_WebKitNavigationAction_free0 (action);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_object_unref0 (n_decision);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1389 "YandexPublishing.c"
+#line 1250 "YandexPublishing.c"
 				} else {
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					g_signal_emit_by_name (self, "login-failed");
-#line 1393 "YandexPublishing.c"
+#line 1254 "YandexPublishing.c"
 				}
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1397 "YandexPublishing.c"
+#line 1258 "YandexPublishing.c"
 			}
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp32_ = decision;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			webkit_policy_decision_use (_tmp32_);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			_tmp28_ = decision;
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			webkit_policy_decision_use (_tmp28_);
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_match_info_unref0 (info);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (uri);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			__vala_WebKitNavigationAction_free0 (action);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (n_decision);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1413 "YandexPublishing.c"
+#line 1274 "YandexPublishing.c"
 		}
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1417 "YandexPublishing.c"
+#line 1278 "YandexPublishing.c"
 		{
-			WebKitPolicyDecision* _tmp33_ = NULL;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			_tmp33_ = decision;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			webkit_policy_decision_use (_tmp33_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			WebKitPolicyDecision* _tmp29_ = NULL;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			_tmp29_ = decision;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+			webkit_policy_decision_use (_tmp29_);
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1426 "YandexPublishing.c"
+#line 1287 "YandexPublishing.c"
 		}
 		default:
 		{
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			result = FALSE;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return result;
-#line 1434 "YandexPublishing.c"
+#line 1295 "YandexPublishing.c"
 		}
 	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = TRUE;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return result;
-#line 1441 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_on_load_started (PublishingYandexWebAuthPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1464 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_on_page_load_changed (PublishingYandexWebAuthPane* self, WebKitLoadEvent load_event) {
-	WebKitLoadEvent _tmp0_ = 0;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = load_event;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	switch (_tmp0_) {
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		case WEBKIT_LOAD_STARTED:
-#line 1478 "YandexPublishing.c"
-		{
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			publishing_yandex_web_auth_pane_on_load_started (self);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			break;
-#line 1484 "YandexPublishing.c"
-		}
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		case WEBKIT_LOAD_FINISHED:
-#line 1488 "YandexPublishing.c"
-		{
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			publishing_yandex_web_auth_pane_on_page_load (self);
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-			break;
-#line 1494 "YandexPublishing.c"
-		}
-		default:
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		break;
-#line 1499 "YandexPublishing.c"
-	}
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return;
-#line 1503 "YandexPublishing.c"
-}
-
-
-static GtkWidget* publishing_yandex_web_auth_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingYandexWebAuthPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	result = _tmp1_;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	return result;
-#line 1522 "YandexPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_web_auth_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingYandexWebAuthPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1535 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingYandexWebAuthPane * self;
-	WebKitWebView* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp0_ = self->priv->webview;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = self->priv->login_url;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	webkit_web_view_load_uri (_tmp0_, _tmp1_);
-#line 1551 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingYandexWebAuthPane * self;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1559 "YandexPublishing.c"
+#line 1302 "YandexPublishing.c"
 }
 
 
@@ -1565,42 +1308,23 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate));
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	((GObjectClass *) klass)->constructed = publishing_yandex_web_auth_pane_real_constructed;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_yandex_web_auth_pane_real_on_page_load;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1574 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_get_widget;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_get_preferred_geometry;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_on_pane_installed;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_on_pane_uninstalled;
-#line 1589 "YandexPublishing.c"
+#line 1321 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->webview = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->webview_frame = NULL;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	self->priv->login_url = NULL;
-#line 1604 "YandexPublishing.c"
+#line 1328 "YandexPublishing.c"
 }
 
 
@@ -1609,18 +1333,10 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (self->priv->webview_frame);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_regex_unref0 (self->priv->re);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (self->priv->login_url);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1624 "YandexPublishing.c"
+#line 1340 "YandexPublishing.c"
 }
 
 
@@ -1628,10 +1344,8 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
 	static volatile gsize publishing_yandex_web_auth_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_yandex_web_auth_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexWebAuthPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_web_auth_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexWebAuthPane), 0, (GInstanceInitFunc) publishing_yandex_web_auth_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_yandex_web_auth_pane_type_id;
-		publishing_yandex_web_auth_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingYandexWebAuthPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_yandex_web_auth_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_yandex_web_auth_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingYandexWebAuthPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_yandex_web_auth_pane_type_id__volatile, publishing_yandex_web_auth_pane_type_id);
 	}
 	return publishing_yandex_web_auth_pane_type_id__volatile;
@@ -1640,238 +1354,238 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
 
 PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type) {
 	PublishingYandexPublishOptions* self = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1648 "YandexPublishing.c"
+#line 1362 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1655 "YandexPublishing.c"
+#line 1369 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_value_publish_options_init (GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1662 "YandexPublishing.c"
+#line 1376 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_value_publish_options_free_value (GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1671 "YandexPublishing.c"
+#line 1385 "YandexPublishing.c"
 	}
 }
 
 
 static void publishing_yandex_value_publish_options_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1681 "YandexPublishing.c"
+#line 1395 "YandexPublishing.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1685 "YandexPublishing.c"
+#line 1399 "YandexPublishing.c"
 	}
 }
 
 
 static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1693 "YandexPublishing.c"
+#line 1407 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1700 "YandexPublishing.c"
+#line 1414 "YandexPublishing.c"
 		PublishingYandexPublishOptions* object;
 		object = collect_values[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1707 "YandexPublishing.c"
+#line 1421 "YandexPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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 1711 "YandexPublishing.c"
+#line 1425 "YandexPublishing.c"
 		}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1715 "YandexPublishing.c"
+#line 1429 "YandexPublishing.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1719 "YandexPublishing.c"
+#line 1433 "YandexPublishing.c"
 	}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1723 "YandexPublishing.c"
+#line 1437 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingYandexPublishOptions** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!object_p) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1734 "YandexPublishing.c"
+#line 1448 "YandexPublishing.c"
 	}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = NULL;
-#line 1740 "YandexPublishing.c"
+#line 1454 "YandexPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1744 "YandexPublishing.c"
+#line 1458 "YandexPublishing.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1748 "YandexPublishing.c"
+#line 1462 "YandexPublishing.c"
 	}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1752 "YandexPublishing.c"
+#line 1466 "YandexPublishing.c"
 }
 
 
 GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingYandexParamSpecPublishOptions* spec;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1766 "YandexPublishing.c"
+#line 1480 "YandexPublishing.c"
 }
 
 
 gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1775 "YandexPublishing.c"
+#line 1489 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
 	PublishingYandexPublishOptions* old;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (v_object) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1795 "YandexPublishing.c"
+#line 1509 "YandexPublishing.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1799 "YandexPublishing.c"
+#line 1513 "YandexPublishing.c"
 	}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1805 "YandexPublishing.c"
+#line 1519 "YandexPublishing.c"
 	}
 }
 
 
 void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
 	PublishingYandexPublishOptions* old;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (v_object) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1824 "YandexPublishing.c"
+#line 1538 "YandexPublishing.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1828 "YandexPublishing.c"
+#line 1542 "YandexPublishing.c"
 	}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1834 "YandexPublishing.c"
+#line 1548 "YandexPublishing.c"
 	}
 }
 
 
 static void publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1844 "YandexPublishing.c"
+#line 1558 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self) {
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->disable_comments = FALSE;
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->hide_original = FALSE;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->destination_album = NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->destination_album_url = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->ref_count = 1;
-#line 1859 "YandexPublishing.c"
+#line 1573 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj) {
 	PublishingYandexPublishOptions * self;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->access_type);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->destination_album);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->destination_album_url);
-#line 1875 "YandexPublishing.c"
+#line 1589 "YandexPublishing.c"
 }
 
 
@@ -1892,24 +1606,24 @@ GType publishing_yandex_publish_options_get_type (void) {
 gpointer publishing_yandex_publish_options_ref (gpointer instance) {
 	PublishingYandexPublishOptions* self;
 	self = instance;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return instance;
-#line 1900 "YandexPublishing.c"
+#line 1614 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_publish_options_unref (gpointer instance) {
 	PublishingYandexPublishOptions* self;
 	self = instance;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1913 "YandexPublishing.c"
+#line 1627 "YandexPublishing.c"
 	}
 }
 
@@ -1917,29 +1631,29 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
 static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingYandexPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1927 "YandexPublishing.c"
+#line 1641 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingYandexPublishingOptionsPane * self;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1935 "YandexPublishing.c"
+#line 1649 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingYandexPublishingOptionsPane * self;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1943 "YandexPublishing.c"
+#line 1657 "YandexPublishing.c"
 }
 
 
@@ -1948,31 +1662,31 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->box;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp1_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1962 "YandexPublishing.c"
+#line 1676 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1969 "YandexPublishing.c"
+#line 1683 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1976 "YandexPublishing.c"
+#line 1690 "YandexPublishing.c"
 }
 
 
@@ -1981,27 +1695,27 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 	PublishingYandexPublishOptions* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (GEE_IS_HASH_MAP (list), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = options;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->options = _tmp0_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_object_ref_sink (_tmp1_);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->box);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->box = _tmp1_;
-#line 2005 "YandexPublishing.c"
+#line 1719 "YandexPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 		GtkBuilder* _tmp3_ = NULL;
@@ -2026,44 +1740,44 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		GtkBox* _tmp33_ = NULL;
 		GtkBox* _tmp34_ = NULL;
 		GtkAlignment* _tmp35_ = NULL;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = gtk_builder_new ();
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->builder);
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->builder = _tmp2_;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp3_ = self->priv->builder;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2042 "YandexPublishing.c"
+#line 1756 "YandexPublishing.c"
 			goto __catch40_g_error;
 		}
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = self->priv->builder;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		gtk_builder_connect_signals (_tmp4_, NULL);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->builder;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp6_ = gtk_builder_get_object (_tmp5_, "alignment");
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp6_) : NULL);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		align = _tmp7_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = self->priv->builder;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp9_ = gtk_builder_get_object (_tmp8_, "album_list");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp9_) : NULL);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->album_list);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->album_list = _tmp10_;
-#line 2067 "YandexPublishing.c"
+#line 1781 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
 			GeeHashMap* _tmp11_ = NULL;
@@ -2072,25 +1786,25 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 			GeeSet* _tmp14_ = NULL;
 			GeeIterator* _tmp15_ = NULL;
 			GeeIterator* _tmp16_ = NULL;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp11_ = list;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_MAP, GeeMap));
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp13_ = _tmp12_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp14_ = _tmp13_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp16_ = _tmp15_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_tmp14_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_key_it = _tmp16_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 2094 "YandexPublishing.c"
+#line 1808 "YandexPublishing.c"
 				GeeIterator* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
 				gchar* key = NULL;
@@ -2098,83 +1812,83 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				gpointer _tmp20_ = NULL;
 				GtkComboBoxText* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp17_ = _key_it;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp18_ = gee_iterator_next (_tmp17_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp18_) {
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 2110 "YandexPublishing.c"
+#line 1824 "YandexPublishing.c"
 				}
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _key_it;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp20_ = gee_iterator_get (_tmp19_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				key = (gchar*) _tmp20_;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp21_ = self->priv->album_list;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp22_ = key;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (key);
-#line 2126 "YandexPublishing.c"
+#line 1840 "YandexPublishing.c"
 			}
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 2130 "YandexPublishing.c"
+#line 1844 "YandexPublishing.c"
 		}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp23_ = self->priv->album_list;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp24_ = self->priv->builder;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->publish_button = _tmp26_;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp27_ = self->priv->builder;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->logout_button = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp30_ = self->priv->publish_button;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_signal_connect_object (_tmp30_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp31_ = self->priv->logout_button;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp32_ = align;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp33_ = self->priv->box;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp34_ = self->priv->box;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp35_ = align;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		gtk_box_set_child_packing (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (align);
-#line 2178 "YandexPublishing.c"
+#line 1892 "YandexPublishing.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
@@ -2182,50 +1896,50 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		GError* e = NULL;
 		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp36_ = e;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp37_ = _tmp36_->message;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_warning ("YandexPublishing.vala:263: Could not load UI: %s", _tmp37_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp37_);
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2198 "YandexPublishing.c"
+#line 1912 "YandexPublishing.c"
 	}
 	__finally40:
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 2209 "YandexPublishing.c"
+#line 1923 "YandexPublishing.c"
 	}
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2213 "YandexPublishing.c"
+#line 1927 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 2220 "YandexPublishing.c"
+#line 1934 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self) {
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 2229 "YandexPublishing.c"
+#line 1943 "YandexPublishing.c"
 }
 
 
@@ -2254,136 +1968,136 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 	GtkComboBoxText* _tmp19_ = NULL;
 	PublishingYandexPublishOptions* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->options;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->album_list;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = gtk_combo_box_text_get_active_text (_tmp1_);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp0_->destination_album);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_->destination_album = _tmp2_;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = self->priv->builder;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = gtk_builder_get_object (_tmp3_, "hide_original_check");
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp4_) : NULL);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	tmp = _tmp5_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = self->priv->options;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp7_ = tmp;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_->hide_original = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp10_ = self->priv->builder;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "disable_comments_check");
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp11_) : NULL);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	tmp = _tmp12_;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_ = self->priv->options;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp14_ = tmp;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp16_ = _tmp15_;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_->disable_comments = _tmp16_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp17_ = self->priv->builder;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp18_ = gtk_builder_get_object (_tmp17_, "access_type_list");
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp18_) : NULL);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	access_type = _tmp19_;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp20_ = self->priv->options;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp21_ = gtk_combo_box_text_get_active_text (access_type);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp20_->access_type);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp20_->access_type = _tmp21_;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (access_type);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 2330 "YandexPublishing.c"
+#line 2044 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexPublishingOptionsPanePrivate));
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_publishing_options_pane_finalize;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2345 "YandexPublishing.c"
+#line 2059 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2360 "YandexPublishing.c"
+#line 2074 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2367 "YandexPublishing.c"
+#line 2081 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
 	PublishingYandexPublishingOptionsPane * self;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->box);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->album_list);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2387 "YandexPublishing.c"
+#line 2101 "YandexPublishing.c"
 }
 
 
@@ -2407,32 +2121,32 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	PublishingYandexPublishOptions* _tmp2_ = NULL;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = session;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = photos;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1__length1 = photos_length1;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = options;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->options = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2429 "YandexPublishing.c"
+#line 2143 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2436 "YandexPublishing.c"
+#line 2150 "YandexPublishing.c"
 }
 
 
@@ -2446,65 +2160,65 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 	SpitPublishingPublishable* _tmp4_ = NULL;
 	PublishingYandexUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:297: create transaction");
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:248: create transaction");
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->options;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = publishing_yandex_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp6_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2478 "YandexPublishing.c"
+#line 2192 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_yandex_uploader_finalize;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction;
-#line 2491 "YandexPublishing.c"
+#line 2205 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2498 "YandexPublishing.c"
+#line 2212 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingYandexUploader * self;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2508 "YandexPublishing.c"
+#line 2222 "YandexPublishing.c"
 }
 
 
@@ -2524,7 +2238,7 @@ static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
 #line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2528 "YandexPublishing.c"
+#line 2242 "YandexPublishing.c"
 		gchar* _tmp0_ = NULL;
 #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
@@ -2532,7 +2246,7 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp0_;
 #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2536 "YandexPublishing.c"
+#line 2250 "YandexPublishing.c"
 	} else {
 		gchar* _tmp1_ = NULL;
 #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2541,15 +2255,15 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp1_;
 #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2545 "YandexPublishing.c"
+#line 2259 "YandexPublishing.c"
 	}
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 2553 "YandexPublishing.c"
+#line 2267 "YandexPublishing.c"
 }
 
 
@@ -2593,27 +2307,27 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2597 "YandexPublishing.c"
+#line 2311 "YandexPublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2603 "YandexPublishing.c"
+#line 2317 "YandexPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	var = (g_free (var), NULL);
-#line 2610 "YandexPublishing.c"
+#line 2324 "YandexPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 2617 "YandexPublishing.c"
+#line 2331 "YandexPublishing.c"
 }
 
 
@@ -2686,91 +2400,91 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	gchar* _tmp67_ = NULL;
 	SoupMessageHeaders* _tmp68_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (photo), NULL);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = session;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = options;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = _tmp1_->destination_album_url;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, _tmp0_, _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "qwe", "image/jpeg", (gulong) 1);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = photo;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = options;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp7_ = _tmp6_->destination_album;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = options;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = _tmp8_->destination_album_url;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:308: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp10_ = soup_multipart_new ("multipart/form-data");
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	message_parts = _tmp10_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp11_ = photo;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = spit_publishing_publishable_get_publishing_name (_tmp11_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_ = _tmp12_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_append_form_string (message_parts, "title", _tmp13_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp13_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp14_ = options;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp15_ = _tmp14_->hide_original;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp16_ = bool_to_string (_tmp15_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_append_form_string (message_parts, "hide_original", _tmp17_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp18_ = options;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp19_ = _tmp18_->disable_comments;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp20_ = bool_to_string (_tmp19_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp21_ = _tmp20_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_append_form_string (message_parts, "disable_comments", _tmp21_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp21_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp22_ = options;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp23_ = _tmp22_->access_type;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp24_ = g_utf8_strdown (_tmp23_, (gssize) -1);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp25_ = _tmp24_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_append_form_string (message_parts, "access", _tmp25_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 2774 "YandexPublishing.c"
+#line 2488 "YandexPublishing.c"
 	{
 		SpitPublishingPublishable* _tmp26_ = NULL;
 		GFile* _tmp27_ = NULL;
@@ -2779,46 +2493,46 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gsize _tmp32_ = 0UL;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp26_ = photo;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp28_ = _tmp27_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp29_ = g_file_get_path (_tmp28_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp30_ = _tmp29_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_file_get_contents (_tmp30_, &_tmp31_, &_tmp32_, &_inner_error_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (photo_data);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		photo_data = _tmp31_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		data_length = _tmp32_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp30_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (_tmp28_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2809 "YandexPublishing.c"
+#line 2523 "YandexPublishing.c"
 				goto __catch41_g_file_error;
 			}
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (photo_data);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return NULL;
-#line 2822 "YandexPublishing.c"
+#line 2536 "YandexPublishing.c"
 		}
 	}
 	goto __finally41;
@@ -2832,170 +2546,170 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		gchar* _tmp37_ = NULL;
 		GError* _tmp38_ = NULL;
 		const gchar* _tmp39_ = NULL;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp33_ = photo;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp34_ = spit_publishing_publishable_get_serialized_file (_tmp33_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp35_ = _tmp34_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp36_ = g_file_get_path (_tmp35_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp37_ = _tmp36_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp38_ = e;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp39_ = _tmp38_->message;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_critical ("YandexPublishing.vala:322: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp37_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (_tmp35_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2862 "YandexPublishing.c"
+#line 2576 "YandexPublishing.c"
 	}
 	__finally41:
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (photo_data);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		__vala_SoupMultipart_free0 (message_parts);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 2877 "YandexPublishing.c"
+#line 2591 "YandexPublishing.c"
 	}
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp40_ = soup_multipart_get_length (message_parts);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	image_part_num = _tmp40_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp41_ = string_get_data (photo_data, &_tmp41__length1);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp42_ = _tmp41_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp42__length1 = _tmp41__length1;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	bindable_data = _tmp43_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp44_ = photo;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp46_ = _tmp45_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp47_ = g_file_get_path (_tmp46_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp48_ = _tmp47_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp48_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (_tmp46_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	image_part_header = _tmp49_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	image_part_body = _tmp50_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp51_ = g_str_hash;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp52_ = g_str_equal;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_result_ = _tmp53_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp54_ = g_strdup ("name");
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp55_ = g_strdup ("image");
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_hash_table_insert (_result_, _tmp54_, _tmp55_);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp56_ = g_strdup ("filename");
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp57_ = g_strdup ("unused");
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_hash_table_insert (_result_, _tmp56_, _tmp57_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp59_ = _tmp58_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp61_ = _tmp60_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp59_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	outbound_message = _tmp61_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp62_ = outbound_message->request_headers;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp63_ = session;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp65_ = _tmp64_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp67_ = _tmp66_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp67_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp65_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp68_ = outbound_message->request_headers;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_message_headers_append (_tmp68_, "Connection", "close");
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (outbound_message);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_hash_table_unref0 (_result_);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	__vala_SoupBuffer_free0 (bindable_data);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (photo_data);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2985 "YandexPublishing.c"
+#line 2699 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2992 "YandexPublishing.c"
+#line 2706 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2999 "YandexPublishing.c"
+#line 2713 "YandexPublishing.c"
 }
 
 
@@ -3022,48 +2736,48 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
 	PublishingYandexSession* _tmp2_ = NULL;
 	GeeHashMap* _tmp3_ = NULL;
 	PublishingYandexPublishOptions* _tmp4_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = (PublishingYandexYandexPublisher*) g_object_new (object_type, NULL);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = service;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service = _tmp0_;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = host;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->host = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = publishing_yandex_session_new ();
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->session = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->album_list);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->album_list = _tmp3_;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = publishing_yandex_publish_options_new ();
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_yandex_publish_options_unref0 (self->priv->options);
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->options = _tmp4_;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 3060 "YandexPublishing.c"
+#line 2774 "YandexPublishing.c"
 }
 
 
 PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 3067 "YandexPublishing.c"
+#line 2781 "YandexPublishing.c"
 }
 
 
@@ -3071,46 +2785,46 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", NULL);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp1_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3085 "YandexPublishing.c"
+#line 2799 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (auth_token != NULL);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = auth_token;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 3102 "YandexPublishing.c"
+#line 2816 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 3114 "YandexPublishing.c"
+#line 2828 "YandexPublishing.c"
 }
 
 
@@ -3119,21 +2833,21 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), FALSE);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp1_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp2_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3137 "YandexPublishing.c"
+#line 2851 "YandexPublishing.c"
 }
 
 
@@ -3141,15 +2855,15 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
 	PublishingYandexYandexPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3153 "YandexPublishing.c"
+#line 2867 "YandexPublishing.c"
 }
 
 
@@ -3158,62 +2872,62 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = _tmp1_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3172 "YandexPublishing.c"
+#line 2886 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = NULL;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3186 "YandexPublishing.c"
+#line 2900 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error) {
 	gchar* title = NULL;
 	gchar* link = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	title = NULL;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	link = NULL;
-#line 3199 "YandexPublishing.c"
+#line 2913 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
 		xmlNode* _tmp0_ = NULL;
 		xmlNode* _tmp1_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp0_ = e;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp1_ = _tmp0_->children;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		c = _tmp1_;
-#line 3210 "YandexPublishing.c"
+#line 2924 "YandexPublishing.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp2_ = TRUE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3217 "YandexPublishing.c"
+#line 2931 "YandexPublishing.c"
 				xmlNode* _tmp5_ = NULL;
 				xmlNode* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
@@ -3222,156 +2936,156 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				const gchar* _tmp12_ = NULL;
 				gboolean _tmp18_ = FALSE;
 				const gchar* _tmp19_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp2_) {
-#line 3228 "YandexPublishing.c"
+#line 2942 "YandexPublishing.c"
 					xmlNode* _tmp3_ = NULL;
 					xmlNode* _tmp4_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp3_ = c;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp4_ = _tmp3_->next;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					c = _tmp4_;
-#line 3237 "YandexPublishing.c"
+#line 2951 "YandexPublishing.c"
 				}
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp2_ = FALSE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp5_ = c;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!(_tmp5_ != NULL)) {
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3247 "YandexPublishing.c"
+#line 2961 "YandexPublishing.c"
 				}
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = c;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp7_ = _tmp6_->name;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 3255 "YandexPublishing.c"
+#line 2969 "YandexPublishing.c"
 					xmlNode* _tmp8_ = NULL;
 					gchar* _tmp9_ = NULL;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = c;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp9_ = (gchar*) xmlNodeGetContent (_tmp8_);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (title);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					title = _tmp9_;
-#line 3266 "YandexPublishing.c"
+#line 2980 "YandexPublishing.c"
 				}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = c;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = _tmp11_->name;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 3274 "YandexPublishing.c"
+#line 2988 "YandexPublishing.c"
 					xmlNode* _tmp13_ = NULL;
 					gchar* _tmp14_ = NULL;
 					gchar* _tmp15_ = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp13_ = c;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "rel");
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp15_ = _tmp14_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (_tmp15_);
-#line 3288 "YandexPublishing.c"
+#line 3002 "YandexPublishing.c"
 				} else {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = FALSE;
-#line 3292 "YandexPublishing.c"
+#line 3006 "YandexPublishing.c"
 				}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp10_) {
-#line 3296 "YandexPublishing.c"
+#line 3010 "YandexPublishing.c"
 					xmlNode* _tmp16_ = NULL;
 					gchar* _tmp17_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = c;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp17_ = (gchar*) xmlGetProp (_tmp16_, (xmlChar*) "href");
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (link);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					link = _tmp17_;
-#line 3307 "YandexPublishing.c"
+#line 3021 "YandexPublishing.c"
 				}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = title;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp19_ != NULL) {
-#line 3313 "YandexPublishing.c"
+#line 3027 "YandexPublishing.c"
 					const gchar* _tmp20_ = NULL;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = link;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = _tmp20_ != NULL;
-#line 3319 "YandexPublishing.c"
+#line 3033 "YandexPublishing.c"
 				} else {
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = FALSE;
-#line 3323 "YandexPublishing.c"
+#line 3037 "YandexPublishing.c"
 				}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp18_) {
-#line 3327 "YandexPublishing.c"
+#line 3041 "YandexPublishing.c"
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					GeeHashMap* _tmp23_ = NULL;
 					const gchar* _tmp24_ = NULL;
 					const gchar* _tmp25_ = NULL;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp21_ = title;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp22_ = link;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_debug ("YandexPublishing.vala:411: Added album: '%s', link: %s", _tmp21_, _tmp22_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+					g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp21_, _tmp22_);
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp23_ = self->priv->album_list;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp24_ = title;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp25_ = link;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (title);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					title = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (link);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					link = NULL;
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3357 "YandexPublishing.c"
+#line 3071 "YandexPublishing.c"
 				}
 			}
 		}
 	}
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (link);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (title);
-#line 3366 "YandexPublishing.c"
+#line 3080 "YandexPublishing.c"
 }
 
 
 static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3375 "YandexPublishing.c"
+#line 3089 "YandexPublishing.c"
 }
 
 
@@ -3384,71 +3098,71 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 	xmlNode* _tmp3_ = NULL;
 	xmlNode* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (data != NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = data;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	doc = _tmp1_;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3406 "YandexPublishing.c"
+#line 3120 "YandexPublishing.c"
 		} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3414 "YandexPublishing.c"
+#line 3128 "YandexPublishing.c"
 		}
 	}
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = doc;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	root = _tmp3_;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = root;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp4_, &_inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3437 "YandexPublishing.c"
+#line 3151 "YandexPublishing.c"
 		} else {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3447 "YandexPublishing.c"
+#line 3161 "YandexPublishing.c"
 		}
 	}
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3452 "YandexPublishing.c"
+#line 3166 "YandexPublishing.c"
 }
 
 
@@ -3460,144 +3174,144 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
 	xmlNode* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (data != NULL);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = data;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	doc = _tmp1_;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3482 "YandexPublishing.c"
+#line 3196 "YandexPublishing.c"
 		} else {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3490 "YandexPublishing.c"
+#line 3204 "YandexPublishing.c"
 		}
 	}
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = doc;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	root = _tmp3_;
-#line 3499 "YandexPublishing.c"
+#line 3213 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
 		xmlNode* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = root;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = _tmp4_->children;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _tmp5_;
-#line 3510 "YandexPublishing.c"
+#line 3224 "YandexPublishing.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp6_ = TRUE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3517 "YandexPublishing.c"
+#line 3231 "YandexPublishing.c"
 				xmlNode* _tmp9_ = NULL;
 				xmlNode* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
 				xmlNode* _tmp12_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp6_) {
-#line 3524 "YandexPublishing.c"
+#line 3238 "YandexPublishing.c"
 					xmlNode* _tmp7_ = NULL;
 					xmlNode* _tmp8_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp7_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = _tmp7_->next;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					e = _tmp8_;
-#line 3533 "YandexPublishing.c"
+#line 3247 "YandexPublishing.c"
 				}
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp9_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!(_tmp9_ != NULL)) {
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3543 "YandexPublishing.c"
+#line 3257 "YandexPublishing.c"
 				}
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp10_ = e;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = _tmp10_->name;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp11_, "entry") != 0) {
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					continue;
-#line 3553 "YandexPublishing.c"
+#line 3267 "YandexPublishing.c"
 				}
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = e;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp12_, &_inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						g_propagate_error (error, _inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3569 "YandexPublishing.c"
+#line 3283 "YandexPublishing.c"
 					} else {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						g_clear_error (&_inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3579 "YandexPublishing.c"
+#line 3293 "YandexPublishing.c"
 					}
 				}
 			}
 		}
 	}
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3587 "YandexPublishing.c"
+#line 3301 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3594 "YandexPublishing.c"
+#line 3308 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3601 "YandexPublishing.c"
+#line 3315 "YandexPublishing.c"
 }
 
 
@@ -3608,29 +3322,29 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = err;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _tmp4_->message;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:443: Album creation error: %s", _tmp5_);
-#line 3634 "YandexPublishing.c"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
+#line 3348 "YandexPublishing.c"
 }
 
 
@@ -3646,51 +3360,51 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	gchar* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3666 "YandexPublishing.c"
+#line 3380 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = t;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp6_, &_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp6_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3685 "YandexPublishing.c"
+#line 3399 "YandexPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3694 "YandexPublishing.c"
+#line 3408 "YandexPublishing.c"
 		}
 	}
 	goto __finally42;
@@ -3699,67 +3413,67 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = self->priv->host;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = err;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3717 "YandexPublishing.c"
+#line 3431 "YandexPublishing.c"
 	}
 	__finally42:
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3728 "YandexPublishing.c"
+#line 3442 "YandexPublishing.c"
 	}
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->album_list;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp10_ = self->priv->options;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp11_ = _tmp10_->destination_album;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_ = (gchar*) _tmp12_;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp14_ = _tmp13_ != NULL;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp13_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp14_) {
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3748 "YandexPublishing.c"
+#line 3462 "YandexPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp15_ = self->priv->host;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp17_ = _tmp16_;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp17_);
-#line 3763 "YandexPublishing.c"
+#line 3477 "YandexPublishing.c"
 	}
 }
 
@@ -3776,59 +3490,59 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	const gchar* _tmp5_ = NULL;
 	PublishingYandexTransaction* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->options;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _tmp0_->destination_album;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	album = _tmp2_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = g_strdup_printf ("<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:f=\"yandex:fotki\">" \
 "<title>%s</title></entry>", album);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	data = _tmp3_;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = self->priv->service_url;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = publishing_yandex_transaction_new_with_url (_tmp4_, _tmp5_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	t = _tmp6_;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_add_data (t, "application/atom+xml; charset=utf-8; type=entry", data);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3808 "YandexPublishing.c"
+#line 3522 "YandexPublishing.c"
 	{
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3816 "YandexPublishing.c"
+#line 3530 "YandexPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (data);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (album);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3831 "YandexPublishing.c"
+#line 3545 "YandexPublishing.c"
 		}
 	}
 	goto __finally43;
@@ -3837,58 +3551,58 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = self->priv->host;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = err;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 3852 "YandexPublishing.c"
+#line 3566 "YandexPublishing.c"
 	}
 	__finally43:
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (t);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (data);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (album);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3869 "YandexPublishing.c"
+#line 3583 "YandexPublishing.c"
 	}
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (data);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (album);
-#line 3877 "YandexPublishing.c"
+#line 3591 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3884 "YandexPublishing.c"
+#line 3598 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3891 "YandexPublishing.c"
+#line 3605 "YandexPublishing.c"
 }
 
 
@@ -3900,51 +3614,51 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	gint _tmp4_ = 0;
 	SpitPublishingPluginHost* _tmp8_ = NULL;
 	SpitPublishingPluginHost* _tmp9_ = NULL;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = uploader;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = uploader;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = num_published;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp4_ == 0) {
-#line 3923 "YandexPublishing.c"
+#line 3637 "YandexPublishing.c"
 		SpitPublishingPluginHost* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 3937 "YandexPublishing.c"
+#line 3651 "YandexPublishing.c"
 	}
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->host;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp8_, FALSE);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->host;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3947 "YandexPublishing.c"
+#line 3661 "YandexPublishing.c"
 }
 
 
@@ -3955,29 +3669,29 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = uploader;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = uploader;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = err;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _tmp4_->message;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:497: Photo upload error: %s", _tmp5_);
-#line 3980 "YandexPublishing.c"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
+#line 3694 "YandexPublishing.c"
 }
 
 
@@ -3989,37 +3703,37 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
 	void* _tmp2__target = NULL;
 	gint _tmp3_ = 0;
 	gdouble _tmp4_ = 0.0;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = completed_fraction;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:501: EVENT: uploader reports upload %.2f percent" \
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:452: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp0_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->progress_reporter;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1__target = self->priv->progress_reporter_target;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = file_number;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = completed_fraction;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 4014 "YandexPublishing.c"
+#line 3728 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 4021 "YandexPublishing.c"
+#line 3735 "YandexPublishing.c"
 }
 
 
@@ -4044,100 +3758,100 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
 	PublishingYandexSession* _tmp13_ = NULL;
 	PublishingYandexPublishOptions* _tmp14_ = NULL;
 	PublishingYandexUploader* _tmp15_ = NULL;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, 0, FALSE, &_tmp2_, &_tmp3_);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = _tmp4_;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target = _tmp2_;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp3_;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = self->priv->options;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = self->priv->album_list;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp7_ = self->priv->options;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = _tmp7_->destination_album;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp5_->destination_album_url);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_->destination_album_url = (gchar*) _tmp9_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables = _tmp12_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_ = self->priv->session;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp14_ = self->priv->options;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp15_ = publishing_yandex_uploader_new (_tmp13_, _tmp14_, publishables, publishables_length1);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	uploader = _tmp15_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4112 "YandexPublishing.c"
+#line 3826 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
 	gboolean _tmp0_ = FALSE;
 	PublishingYandexSession* _tmp1_ = NULL;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!_tmp0_) {
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4127 "YandexPublishing.c"
+#line 3841 "YandexPublishing.c"
 	}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->session;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_session_deauthenticate (_tmp1_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 4139 "YandexPublishing.c"
+#line 3853 "YandexPublishing.c"
 }
 
 
@@ -4155,64 +3869,64 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 	gpointer _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->options;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _tmp0_->destination_album;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->album_list;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = self->priv->options;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = _tmp3_->destination_album;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = (gchar*) _tmp5_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:535: Going to publish to '%s' : %s", _tmp1_, _tmp6_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:486: Going to publish to '%s' : %s", _tmp1_, _tmp6_);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp7_ = self->priv->album_list;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->options;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = _tmp8_->destination_album;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp11_ = (gchar*) _tmp10_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = _tmp11_ == NULL;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp11_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp12_) {
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 4195 "YandexPublishing.c"
+#line 3909 "YandexPublishing.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 4199 "YandexPublishing.c"
+#line 3913 "YandexPublishing.c"
 	}
 }
 
 
 static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4207 "YandexPublishing.c"
+#line 3921 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4214 "YandexPublishing.c"
+#line 3928 "YandexPublishing.c"
 }
 
 
@@ -4223,45 +3937,45 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = err;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _tmp4_->message;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:547: Failed to get album list: %s", _tmp5_);
-#line 4249 "YandexPublishing.c"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
+#line 3963 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 4256 "YandexPublishing.c"
+#line 3970 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 4263 "YandexPublishing.c"
+#line 3977 "YandexPublishing.c"
 }
 
 
@@ -4280,61 +3994,61 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	PublishingYandexPublishingOptionsPane* _tmp15_ = NULL;
 	SpitPublishingPluginHost* _tmp16_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = t;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:554: service_get_album_list_complete: %s", _tmp6_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4308 "YandexPublishing.c"
+#line 4022 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_parse_album_list (self, _tmp9_, &_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4327 "YandexPublishing.c"
+#line 4041 "YandexPublishing.c"
 				goto __catch44_spit_publishing_publishing_error;
 			}
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4336 "YandexPublishing.c"
+#line 4050 "YandexPublishing.c"
 		}
 	}
 	goto __finally44;
@@ -4343,52 +4057,52 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp10_ = self->priv->host;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp11_ = err;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4357 "YandexPublishing.c"
+#line 4071 "YandexPublishing.c"
 	}
 	__finally44:
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4368 "YandexPublishing.c"
+#line 4082 "YandexPublishing.c"
 	}
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = self->priv->options;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp13_ = self->priv->album_list;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp14_ = self->priv->host;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp15_ = publishing_yandex_publishing_options_pane_new (_tmp12_, _tmp13_, _tmp14_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_options_pane = _tmp15_;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish, self, 0);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout, self, 0);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp16_ = self->priv->host;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 4390 "YandexPublishing.c"
+#line 4104 "YandexPublishing.c"
 }
 
 
@@ -4400,50 +4114,50 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 	const gchar* _tmp3_ = NULL;
 	PublishingYandexTransaction* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = url;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->priv->service_url);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service_url = _tmp1_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = url;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = publishing_yandex_transaction_new_with_url (_tmp2_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	t = _tmp4_;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4426 "YandexPublishing.c"
+#line 4140 "YandexPublishing.c"
 	{
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4434 "YandexPublishing.c"
+#line 4148 "YandexPublishing.c"
 				goto __catch45_spit_publishing_publishing_error;
 			}
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4445 "YandexPublishing.c"
+#line 4159 "YandexPublishing.c"
 		}
 	}
 	goto __finally45;
@@ -4452,50 +4166,50 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp6_ = err;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4466 "YandexPublishing.c"
+#line 4180 "YandexPublishing.c"
 	}
 	__finally45:
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (t);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4479 "YandexPublishing.c"
+#line 4193 "YandexPublishing.c"
 	}
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4483 "YandexPublishing.c"
+#line 4197 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4490 "YandexPublishing.c"
+#line 4204 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4497 "YandexPublishing.c"
+#line 4211 "YandexPublishing.c"
 }
 
 
@@ -4506,29 +4220,29 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = err;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = _tmp4_->message;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_warning ("YandexPublishing.vala:587: Failed to fetch account info: %s", _tmp5_);
-#line 4530 "YandexPublishing.c"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
+#line 4244 "YandexPublishing.c"
 }
 
 
@@ -4541,33 +4255,33 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = t;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = t;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = t;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:594: account info: %s", _tmp6_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4569 "YandexPublishing.c"
+#line 4283 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
@@ -4578,114 +4292,114 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		xmlNode* root = NULL;
 		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
 		xmlNode* _tmp13_ = NULL;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		doc = _tmp11_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4598 "YandexPublishing.c"
+#line 4312 "YandexPublishing.c"
 				goto __catch46_spit_publishing_publishing_error;
 			}
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4607 "YandexPublishing.c"
+#line 4321 "YandexPublishing.c"
 		}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp12_ = doc;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		root = _tmp13_;
-#line 4615 "YandexPublishing.c"
+#line 4329 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
 			xmlNode* _tmp14_ = NULL;
 			xmlNode* _tmp15_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp14_ = root;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp15_ = _tmp14_->children;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			work = _tmp15_;
-#line 4626 "YandexPublishing.c"
+#line 4340 "YandexPublishing.c"
 			{
 				gboolean _tmp16_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp16_ = TRUE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				while (TRUE) {
-#line 4633 "YandexPublishing.c"
+#line 4347 "YandexPublishing.c"
 					xmlNode* _tmp19_ = NULL;
 					xmlNode* _tmp20_ = NULL;
 					const gchar* _tmp21_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (!_tmp16_) {
-#line 4639 "YandexPublishing.c"
+#line 4353 "YandexPublishing.c"
 						xmlNode* _tmp17_ = NULL;
 						xmlNode* _tmp18_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp17_ = work;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp18_ = _tmp17_->next;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						work = _tmp18_;
-#line 4648 "YandexPublishing.c"
+#line 4362 "YandexPublishing.c"
 					}
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp19_ = work;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (!(_tmp19_ != NULL)) {
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						break;
-#line 4658 "YandexPublishing.c"
+#line 4372 "YandexPublishing.c"
 					}
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = work;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp21_ = _tmp20_->name;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (g_strcmp0 (_tmp21_, "workspace") != 0) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						continue;
-#line 4668 "YandexPublishing.c"
+#line 4382 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
 						xmlNode* _tmp22_ = NULL;
 						xmlNode* _tmp23_ = NULL;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp22_ = work;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp23_ = _tmp22_->children;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						c = _tmp23_;
-#line 4680 "YandexPublishing.c"
+#line 4394 "YandexPublishing.c"
 						{
 							gboolean _tmp24_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							_tmp24_ = TRUE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							while (TRUE) {
-#line 4687 "YandexPublishing.c"
+#line 4401 "YandexPublishing.c"
 								xmlNode* _tmp27_ = NULL;
 								xmlNode* _tmp28_ = NULL;
 								const gchar* _tmp29_ = NULL;
@@ -4693,52 +4407,52 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								gchar* _tmp31_ = NULL;
 								gchar* _tmp32_ = NULL;
 								gboolean _tmp33_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (!_tmp24_) {
-#line 4697 "YandexPublishing.c"
+#line 4411 "YandexPublishing.c"
 									xmlNode* _tmp25_ = NULL;
 									xmlNode* _tmp26_ = NULL;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp25_ = c;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp26_ = _tmp25_->next;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									c = _tmp26_;
-#line 4706 "YandexPublishing.c"
+#line 4420 "YandexPublishing.c"
 								}
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp24_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp27_ = c;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (!(_tmp27_ != NULL)) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4716 "YandexPublishing.c"
+#line 4430 "YandexPublishing.c"
 								}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp28_ = c;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp29_ = _tmp28_->name;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (g_strcmp0 (_tmp29_, "collection") != 0) {
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									continue;
-#line 4726 "YandexPublishing.c"
+#line 4440 "YandexPublishing.c"
 								}
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp30_ = c;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "id");
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp32_ = _tmp31_;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp33_ = g_strcmp0 (_tmp32_, "album-list") == 0;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_g_free0 (_tmp32_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (_tmp33_) {
-#line 4740 "YandexPublishing.c"
+#line 4454 "YandexPublishing.c"
 									gchar* url = NULL;
 									xmlNode* _tmp34_ = NULL;
 									gchar* _tmp35_ = NULL;
@@ -4746,31 +4460,31 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 									gchar* _tmp37_ = NULL;
 									gchar* _tmp38_ = NULL;
 									const gchar* _tmp39_ = NULL;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp34_ = c;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp35_ = (gchar*) xmlGetProp (_tmp34_, (xmlChar*) "href");
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									url = _tmp35_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp36_ = self->priv->session;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp37_ = publishing_yandex_session_get_auth_token (_tmp36_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp38_ = _tmp37_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp38_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_g_free0 (_tmp38_);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp39_ = url;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp39_);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_g_free0 (url);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4772 "YandexPublishing.c"
+#line 4486 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4778,9 +4492,9 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 				}
 			}
 		}
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4782 "YandexPublishing.c"
+#line 4496 "YandexPublishing.c"
 	}
 	goto __finally46;
 	__catch46_spit_publishing_publishing_error:
@@ -4788,30 +4502,30 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp40_ = NULL;
 		GError* _tmp41_ = NULL;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp40_ = self->priv->host;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp41_ = err;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4802 "YandexPublishing.c"
+#line 4516 "YandexPublishing.c"
 	}
 	__finally46:
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4813 "YandexPublishing.c"
+#line 4527 "YandexPublishing.c"
 	}
 }
 
@@ -4823,46 +4537,46 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 	PublishingYandexSession* _tmp2_ = NULL;
 	PublishingYandexTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (auth_token != NULL);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = auth_token;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_session_set_auth_token (_tmp0_, _tmp1_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "http://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	t = _tmp3_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4845 "YandexPublishing.c"
+#line 4559 "YandexPublishing.c"
 	{
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4853 "YandexPublishing.c"
+#line 4567 "YandexPublishing.c"
 				goto __catch47_spit_publishing_publishing_error;
 			}
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			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 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4864 "YandexPublishing.c"
+#line 4578 "YandexPublishing.c"
 		}
 	}
 	goto __finally47;
@@ -4871,36 +4585,36 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = err;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4885 "YandexPublishing.c"
+#line 4599 "YandexPublishing.c"
 	}
 	__finally47:
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (t);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4898 "YandexPublishing.c"
+#line 4612 "YandexPublishing.c"
 	}
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4902 "YandexPublishing.c"
+#line 4616 "YandexPublishing.c"
 }
 
 
@@ -4909,50 +4623,50 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
 	SpitPublishingPluginHost* _tmp1_ = NULL;
 	SpitPublishingPluginHost* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (access_token != NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = access_token;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:635: login succeeded with token %s", _tmp0_);
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:586: login succeeded with token %s", _tmp0_);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp2_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = access_token;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4931 "YandexPublishing.c"
+#line 4645 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self) {
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:644: login failed");
-#line 4940 "YandexPublishing.c"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:595: login failed");
+#line 4654 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4947 "YandexPublishing.c"
+#line 4661 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4954 "YandexPublishing.c"
+#line 4668 "YandexPublishing.c"
 }
 
 
@@ -4965,61 +4679,61 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
 	PublishingYandexWebAuthPane* _tmp5_ = NULL;
 	SpitPublishingPluginHost* _tmp6_ = NULL;
 	PublishingYandexWebAuthPane* _tmp7_ = NULL;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = g_strdup_printf ("http://oauth.yandex.ru/authorize?client_id=%s&response_type=token", PUBLISHING_YANDEX_client_id);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = publishing_yandex_web_auth_pane_new (_tmp2_);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->web_auth_pane);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->web_auth_pane = _tmp3_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp4_ = self->priv->web_auth_pane;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (_tmp4_, "login-succeeded", (GCallback) _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded, self, 0);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp5_ = self->priv->web_auth_pane;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (_tmp5_, "login-failed", (GCallback) _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed, self, 0);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp7_ = self->priv->web_auth_pane;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4999 "YandexPublishing.c"
+#line 4713 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 5006 "YandexPublishing.c"
+#line 4720 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 5021 "YandexPublishing.c"
+#line 4735 "YandexPublishing.c"
 }
 
 
@@ -5028,152 +4742,152 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	gboolean _tmp0_ = FALSE;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp0_) {
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 5038 "YandexPublishing.c"
+#line 4752 "YandexPublishing.c"
 	}
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_error ("YandexPublishing.vala:667: YandexPublisher: start( ): can't start; thi" \
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 5046 "YandexPublishing.c"
+#line 4760 "YandexPublishing.c"
 	}
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:669: YandexPublisher: starting interaction.");
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = TRUE;
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp2_) {
-#line 5056 "YandexPublishing.c"
+#line 4770 "YandexPublishing.c"
 		PublishingYandexSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp3_ = self->priv->session;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_session_set_auth_token (_tmp3_, _tmp5_);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp6_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 5080 "YandexPublishing.c"
+#line 4794 "YandexPublishing.c"
 	} else {
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 5084 "YandexPublishing.c"
+#line 4798 "YandexPublishing.c"
 	}
 }
 
 
 static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_debug ("YandexPublishing.vala:683: YandexPublisher: stop( ) invoked.");
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	g_debug ("YandexPublishing.vala:634: YandexPublisher: stop( ) invoked.");
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->host = NULL;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 5099 "YandexPublishing.c"
+#line 4813 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 5110 "YandexPublishing.c"
+#line 4824 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_is_running;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_get_service;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop;
-#line 5125 "YandexPublishing.c"
+#line 4839 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE (self);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->host = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service_url = NULL;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->album_list = NULL;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->web_auth_pane = NULL;
-#line 5146 "YandexPublishing.c"
+#line 4860 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
 	PublishingYandexYandexPublisher * self;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->priv->service_url);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->album_list);
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_yandex_publish_options_unref0 (self->priv->options);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (self->priv->web_auth_pane);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 5174 "YandexPublishing.c"
+#line 4888 "YandexPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 2ee67cf..2eb78f3 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -92,46 +92,29 @@ internal class Session : Publishing.RESTSupport.Session {
     }
 }
 
-internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
-    private WebKit.WebView webview = null;
-    private Gtk.Box pane_widget = null;
-    private Gtk.ScrolledWindow webview_frame = null;
-
+internal class WebAuthPane : Shotwell.Plugins.Common.WebAuthenticationPane {
     private Regex re;
-    private string? login_url = null;
 
     public signal void login_succeeded(string success_url);
     public signal void login_failed();
 
     public WebAuthPane(string login_url) {
-        this.login_url = login_url;
+        Object (login_uri : login_url,
+                preferred_geometry :
+                Spit.Publishing.DialogPane.GeometryOptions.RESIZABLE);
+    }
 
+    public override void constructed () {
         try {
             this.re = new Regex("(.*)#access_token=([a-zA-Z0-9]*)&");
         } catch (RegexError e) {
-            critical("%s", e.message);
+            assert_not_reached ();
         }
 
-        pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
-        webview_frame = new Gtk.ScrolledWindow(null, null);
-        webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN);
-        webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-
-        webview = new WebKit.WebView();
-        webview.get_settings().enable_plugins = false;
-
-        webview.load_changed.connect(on_page_load_changed);
-        webview.decide_policy.connect(on_decide_policy);
-        webview.context_menu.connect(() => { return false; });
-
-        webview_frame.add(webview);
-        pane_widget.pack_start(webview_frame, true, true, 0);
+        this.get_view ().decide_policy.connect (on_decide_policy);
     }
 
-    private void on_page_load() {
-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
-    }
+    public override void on_page_load () { }
 
     private bool on_decide_policy (WebKit.PolicyDecision decision,
                                    WebKit.PolicyDecisionType type) {
@@ -148,7 +131,7 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
                     string access_token = info.fetch_all()[2];
 
                     debug("Load completed: %s", access_token);
-                    pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+                    this.set_cursor (Gdk.CursorType.LEFT_PTR);
                     if (access_token != null) {
                         login_succeeded(access_token);
                         decision.ignore();
@@ -166,38 +149,6 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
         }
         return true;
     }
-
-    private void on_load_started() {
-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
-    }
-
-    private void on_page_load_changed (WebKit.LoadEvent load_event) {
-        switch (load_event) {
-            case WebKit.LoadEvent.STARTED:
-                on_load_started();
-                break;
-            case WebKit.LoadEvent.FINISHED:
-                on_page_load();
-                break;
-        }
-
-        return;
-    }
-
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.RESIZABLE;
-    }
-
-    public void on_pane_installed() {
-        webview.load_uri(login_url);
-    }
-
-    public void on_pane_uninstalled() {
-    }
 }
 
 internal class PublishOptions {
diff --git a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
index dc8b373..1f2dfae 100644
--- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
@@ -5,7 +5,7 @@
     <property name="label" translatable="yes">Go _Back</property>
   </object>
   <object class="GtkAction" id="login_action">
-    <property name="label" translatable="yes">_Login</property>
+    <property name="label" translatable="yes">_Log in</property>
   </object>
   <object class="GtkGrid" id="gallery3_auth_pane_widget">
     <property name="visible">True</property>
@@ -142,7 +142,7 @@
         </child>
         <child>
           <object class="GtkButton" id="login_button">
-            <property name="label" translatable="yes">_Login</property>
+            <property name="label" translatable="yes">_Log in</property>
             <property name="related_action">login_action</property>
             <property name="width_request">102</property>
             <property name="visible">True</property>
diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
index 72ac53c..496304f 100644
--- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
@@ -122,7 +122,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Login</property>
+                    <property name="label" translatable="yes">Log in</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 131a547..98f03b8 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -104,7 +104,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Login</property>
+                    <property name="label" translatable="yes">Log in</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index eaf143c..4b08588 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -21,9 +21,8 @@
 #include <libsoup/soup.h>
 #include <float.h>
 #include <math.h>
-#include <webkit2/webkit2.h>
-#include <gdk/gdk.h>
 #include <locale.h>
+#include <webkit2/webkit2.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -318,21 +317,12 @@ struct _PublishingFacebookFacebookPublisherPrivate {
 };
 
 struct _PublishingFacebookWebAuthenticationPane {
-	GObject parent_instance;
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
 	PublishingFacebookWebAuthenticationPanePrivate * priv;
 };
 
 struct _PublishingFacebookWebAuthenticationPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingFacebookWebAuthenticationPanePrivate {
-	WebKitWebView* webview;
-	GtkBox* pane_widget;
-	GtkScrolledWindow* webview_frame;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_table;
-	gint locale_lookup_table_length1;
-	gint _locale_lookup_table_size_;
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
 };
 
 struct _PublishingFacebookWebAuthenticationPaneLocaleLookup {
@@ -551,8 +541,12 @@ static SpitPublishingPublisherIface* publishing_facebook_facebook_publisher_spit
 static gpointer publishing_facebook_web_authentication_pane_parent_class = NULL;
 static gboolean publishing_facebook_web_authentication_pane_cache_dirty;
 static gboolean publishing_facebook_web_authentication_pane_cache_dirty = FALSE;
+static PublishingFacebookWebAuthenticationPaneLocaleLookup** publishing_facebook_web_authentication_pane_locale_lookup_table;
+static gint publishing_facebook_web_authentication_pane_locale_lookup_table_length1;
+static PublishingFacebookWebAuthenticationPaneLocaleLookup** publishing_facebook_web_authentication_pane_locale_lookup_table = NULL;
+static gint publishing_facebook_web_authentication_pane_locale_lookup_table_length1 = 0;
+static gint _publishing_facebook_web_authentication_pane_locale_lookup_table_size_ = 0;
 static gpointer publishing_facebook_web_authentication_pane_locale_lookup_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_facebook_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_facebook_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_parent_class = NULL;
 static SpitPublishingDialogPaneIface* publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -590,7 +584,7 @@ static void facebook_service_finalize (GObject* obj);
 #define PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
 #define PUBLISHING_FACEBOOK_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Facebook.\n" \
 "\n" \
-"If you don't yet have a Facebook account, you can create one during th" \
+"If you don’t yet have a Facebook account, you can create one during th" \
 "e login process. During login, Shotwell Connect may ask you for permis" \
 "sion to upload photos and publish to your feed. These permissions are " \
 "required for Shotwell Connect to function.")
@@ -751,6 +745,9 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self);
 static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base);
 static void publishing_facebook_facebook_publisher_finalize (GObject* obj);
+enum  {
+	PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
+};
 static gpointer publishing_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance);
 static void publishing_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance);
 static GParamSpec* publishing_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -758,24 +755,11 @@ static void publishing_facebook_web_authentication_pane_value_set_locale_lookup
 static void publishing_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_facebook_web_authentication_pane_locale_lookup_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
 static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
 static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
-static void publishing_facebook_web_authentication_pane_on_page_load_changed (PublishingFacebookWebAuthenticationPane* self, WebKitLoadEvent load_event);
-static void _publishing_facebook_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
-static gboolean __lambda4_ (PublishingFacebookWebAuthenticationPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
-static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (PublishingFacebookWebAuthenticationPane* self);
-static gchar* publishing_facebook_web_authentication_pane_get_login_url (PublishingFacebookWebAuthenticationPane* self);
-static void publishing_facebook_web_authentication_pane_on_page_load (PublishingFacebookWebAuthenticationPane* self);
-static void publishing_facebook_web_authentication_pane_on_load_started (PublishingFacebookWebAuthenticationPane* self);
-static GtkWidget* publishing_facebook_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_facebook_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_facebook_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_facebook_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static gchar* publishing_facebook_web_authentication_pane_get_login_url (void);
+static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void);
+static void publishing_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 enum  {
 	PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY
 };
@@ -931,7 +915,7 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 	_tmp0__length1 = facebook_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 927 "FacebookPublishing.c"
+#line 911 "FacebookPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -944,18 +928,18 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 		facebook_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_facebook_service_icon_pixbuf_set_size_ = facebook_service_icon_pixbuf_set_length1;
-#line 940 "FacebookPublishing.c"
+#line 924 "FacebookPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 944 "FacebookPublishing.c"
+#line 928 "FacebookPublishing.c"
 }
 
 
 FacebookService* facebook_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return facebook_service_construct (TYPE_FACEBOOK_SERVICE, resource_directory);
-#line 951 "FacebookPublishing.c"
+#line 935 "FacebookPublishing.c"
 }
 
 
@@ -977,7 +961,7 @@ static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 973 "FacebookPublishing.c"
+#line 957 "FacebookPublishing.c"
 }
 
 
@@ -990,7 +974,7 @@ static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.facebook";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 986 "FacebookPublishing.c"
+#line 970 "FacebookPublishing.c"
 }
 
 
@@ -1003,14 +987,14 @@ static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "Facebook";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 999 "FacebookPublishing.c"
+#line 983 "FacebookPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1006 "FacebookPublishing.c"
+#line 990 "FacebookPublishing.c"
 }
 
 
@@ -1021,17 +1005,17 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1017 "FacebookPublishing.c"
+#line 1001 "FacebookPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 1023 "FacebookPublishing.c"
+#line 1007 "FacebookPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1027 "FacebookPublishing.c"
+#line 1011 "FacebookPublishing.c"
 }
 
 
@@ -1113,7 +1097,7 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 1109 "FacebookPublishing.c"
+#line 1093 "FacebookPublishing.c"
 }
 
 
@@ -1121,7 +1105,7 @@ static void facebook_service_real_activation (SpitPluggable* base, gboolean enab
 	FacebookService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
-#line 1117 "FacebookPublishing.c"
+#line 1101 "FacebookPublishing.c"
 }
 
 
@@ -1142,7 +1126,7 @@ static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1138 "FacebookPublishing.c"
+#line 1122 "FacebookPublishing.c"
 }
 
 
@@ -1155,7 +1139,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1151 "FacebookPublishing.c"
+#line 1135 "FacebookPublishing.c"
 }
 
 
@@ -1164,7 +1148,7 @@ static void facebook_service_class_init (FacebookServiceClass * klass) {
 	facebook_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = facebook_service_finalize;
-#line 1160 "FacebookPublishing.c"
+#line 1144 "FacebookPublishing.c"
 }
 
 
@@ -1181,7 +1165,7 @@ static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) facebook_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) facebook_service_real_activation;
-#line 1177 "FacebookPublishing.c"
+#line 1161 "FacebookPublishing.c"
 }
 
 
@@ -1192,7 +1176,7 @@ static void facebook_service_spit_publishing_service_interface_init (SpitPublish
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) facebook_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) facebook_service_real_get_supported_media;
-#line 1188 "FacebookPublishing.c"
+#line 1172 "FacebookPublishing.c"
 }
 
 
@@ -1206,7 +1190,7 @@ static void facebook_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (facebook_service_parent_class)->finalize (obj);
-#line 1202 "FacebookPublishing.c"
+#line 1186 "FacebookPublishing.c"
 }
 
 
@@ -1256,21 +1240,21 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
 	self->id = _tmp3_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1252 "FacebookPublishing.c"
+#line 1236 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1259 "FacebookPublishing.c"
+#line 1243 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_init (GValue* value) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1266 "FacebookPublishing.c"
+#line 1250 "FacebookPublishing.c"
 }
 
 
@@ -1279,7 +1263,7 @@ static void publishing_facebook_value_album_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1275 "FacebookPublishing.c"
+#line 1259 "FacebookPublishing.c"
 	}
 }
 
@@ -1289,11 +1273,11 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_album_ref (src_value->data[0].v_pointer);
-#line 1285 "FacebookPublishing.c"
+#line 1269 "FacebookPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1289 "FacebookPublishing.c"
+#line 1273 "FacebookPublishing.c"
 	}
 }
 
@@ -1301,37 +1285,37 @@ static void publishing_facebook_value_album_copy_value (const GValue* src_value,
 static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1297 "FacebookPublishing.c"
+#line 1281 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1304 "FacebookPublishing.c"
+#line 1288 "FacebookPublishing.c"
 		PublishingFacebookAlbum* object;
 		object = collect_values[0].v_pointer;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1311 "FacebookPublishing.c"
+#line 1295 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 1315 "FacebookPublishing.c"
+#line 1299 "FacebookPublishing.c"
 		}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1319 "FacebookPublishing.c"
+#line 1303 "FacebookPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1323 "FacebookPublishing.c"
+#line 1307 "FacebookPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1327 "FacebookPublishing.c"
+#line 1311 "FacebookPublishing.c"
 }
 
 
@@ -1342,25 +1326,25 @@ static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1338 "FacebookPublishing.c"
+#line 1322 "FacebookPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1344 "FacebookPublishing.c"
+#line 1328 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1348 "FacebookPublishing.c"
+#line 1332 "FacebookPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1352 "FacebookPublishing.c"
+#line 1336 "FacebookPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1356 "FacebookPublishing.c"
+#line 1340 "FacebookPublishing.c"
 }
 
 
@@ -1374,7 +1358,7 @@ GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1370 "FacebookPublishing.c"
+#line 1354 "FacebookPublishing.c"
 }
 
 
@@ -1383,7 +1367,7 @@ gpointer publishing_facebook_value_get_album (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1379 "FacebookPublishing.c"
+#line 1363 "FacebookPublishing.c"
 }
 
 
@@ -1403,17 +1387,17 @@ void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1399 "FacebookPublishing.c"
+#line 1383 "FacebookPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1403 "FacebookPublishing.c"
+#line 1387 "FacebookPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1409 "FacebookPublishing.c"
+#line 1393 "FacebookPublishing.c"
 	}
 }
 
@@ -1432,17 +1416,17 @@ void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1428 "FacebookPublishing.c"
+#line 1412 "FacebookPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1432 "FacebookPublishing.c"
+#line 1416 "FacebookPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1438 "FacebookPublishing.c"
+#line 1422 "FacebookPublishing.c"
 	}
 }
 
@@ -1452,14 +1436,14 @@ static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass *
 	publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1448 "FacebookPublishing.c"
+#line 1432 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 1455 "FacebookPublishing.c"
+#line 1439 "FacebookPublishing.c"
 }
 
 
@@ -1473,7 +1457,7 @@ static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) {
 	_g_free0 (self->name);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 1469 "FacebookPublishing.c"
+#line 1453 "FacebookPublishing.c"
 }
 
 
@@ -1498,7 +1482,7 @@ gpointer publishing_facebook_album_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 1494 "FacebookPublishing.c"
+#line 1478 "FacebookPublishing.c"
 }
 
 
@@ -1511,7 +1495,7 @@ void publishing_facebook_album_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1507 "FacebookPublishing.c"
+#line 1491 "FacebookPublishing.c"
 	}
 }
 
@@ -1522,7 +1506,7 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 	switch (self) {
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1518 "FacebookPublishing.c"
+#line 1502 "FacebookPublishing.c"
 		{
 			const gchar* _tmp0_ = NULL;
 			gchar* _tmp1_ = NULL;
@@ -1534,11 +1518,11 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			result = _tmp1_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1530 "FacebookPublishing.c"
+#line 1514 "FacebookPublishing.c"
 		}
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1534 "FacebookPublishing.c"
+#line 1518 "FacebookPublishing.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
@@ -1550,7 +1534,7 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			result = _tmp3_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1546 "FacebookPublishing.c"
+#line 1530 "FacebookPublishing.c"
 		}
 		default:
 		{
@@ -1559,7 +1543,7 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			_tmp4_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_error ("FacebookPublishing.vala:93: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
-#line 1555 "FacebookPublishing.c"
+#line 1539 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1571,23 +1555,23 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
 	switch (self) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1567 "FacebookPublishing.c"
+#line 1551 "FacebookPublishing.c"
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 720;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1573 "FacebookPublishing.c"
+#line 1557 "FacebookPublishing.c"
 		}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1577 "FacebookPublishing.c"
+#line 1561 "FacebookPublishing.c"
 		{
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 2048;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1583 "FacebookPublishing.c"
+#line 1567 "FacebookPublishing.c"
 		}
 		default:
 		{
@@ -1596,7 +1580,7 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
 			_tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_error ("FacebookPublishing.vala:106: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
-#line 1592 "FacebookPublishing.c"
+#line 1576 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1642,21 +1626,21 @@ PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameter
 	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1638 "FacebookPublishing.c"
+#line 1622 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1645 "FacebookPublishing.c"
+#line 1629 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_album_ref0 (gpointer self) {
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1652 "FacebookPublishing.c"
+#line 1636 "FacebookPublishing.c"
 }
 
 
@@ -1667,13 +1651,13 @@ static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1663 "FacebookPublishing.c"
+#line 1647 "FacebookPublishing.c"
 	}
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1669 "FacebookPublishing.c"
+#line 1653 "FacebookPublishing.c"
 }
 
 
@@ -1699,7 +1683,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	_tmp0__length1 = self->albums_length1;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 1695 "FacebookPublishing.c"
+#line 1679 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
@@ -1711,7 +1695,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 		self->albums_length1 = 0;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->_albums_size_ = self->albums_length1;
-#line 1707 "FacebookPublishing.c"
+#line 1691 "FacebookPublishing.c"
 	}
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = name;
@@ -1731,7 +1715,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
 #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
-#line 1727 "FacebookPublishing.c"
+#line 1711 "FacebookPublishing.c"
 }
 
 
@@ -1747,20 +1731,20 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 		self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 1743 "FacebookPublishing.c"
+#line 1727 "FacebookPublishing.c"
 	}
 	{
 		gint i = 0;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		i = 0;
-#line 1749 "FacebookPublishing.c"
+#line 1733 "FacebookPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = TRUE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			while (TRUE) {
-#line 1756 "FacebookPublishing.c"
+#line 1740 "FacebookPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingFacebookAlbum** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -1772,13 +1756,13 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				const gchar* _tmp9_ = NULL;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!_tmp1_) {
-#line 1768 "FacebookPublishing.c"
+#line 1752 "FacebookPublishing.c"
 					gint _tmp2_ = 0;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp2_ = i;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					i = _tmp2_ + 1;
-#line 1774 "FacebookPublishing.c"
+#line 1758 "FacebookPublishing.c"
 				}
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = FALSE;
@@ -1792,7 +1776,7 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					break;
-#line 1788 "FacebookPublishing.c"
+#line 1772 "FacebookPublishing.c"
 				}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5_ = self->albums;
@@ -1808,7 +1792,7 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				_tmp9_ = name;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1804 "FacebookPublishing.c"
+#line 1788 "FacebookPublishing.c"
 					gint _tmp10_ = 0;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp10_ = i;
@@ -1816,14 +1800,14 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 					self->target_album = _tmp10_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					return;
-#line 1812 "FacebookPublishing.c"
+#line 1796 "FacebookPublishing.c"
 				}
 			}
 		}
 	}
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1819 "FacebookPublishing.c"
+#line 1803 "FacebookPublishing.c"
 }
 
 
@@ -1848,14 +1832,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	if (_tmp1_ == NULL) {
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1844 "FacebookPublishing.c"
+#line 1828 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1851 "FacebookPublishing.c"
+#line 1835 "FacebookPublishing.c"
 	}
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1863,7 +1847,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 		result = NULL;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1859 "FacebookPublishing.c"
+#line 1843 "FacebookPublishing.c"
 	}
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1881,7 +1865,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	result = _tmp7_;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1877 "FacebookPublishing.c"
+#line 1861 "FacebookPublishing.c"
 }
 
 
@@ -1906,14 +1890,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	if (_tmp1_ == NULL) {
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1902 "FacebookPublishing.c"
+#line 1886 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1909 "FacebookPublishing.c"
+#line 1893 "FacebookPublishing.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1921,7 +1905,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 		result = NULL;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1917 "FacebookPublishing.c"
+#line 1901 "FacebookPublishing.c"
 	}
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1939,14 +1923,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	result = _tmp7_;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1935 "FacebookPublishing.c"
+#line 1919 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1942 "FacebookPublishing.c"
+#line 1926 "FacebookPublishing.c"
 }
 
 
@@ -1955,7 +1939,7 @@ static void publishing_facebook_value_publishing_parameters_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1951 "FacebookPublishing.c"
+#line 1935 "FacebookPublishing.c"
 	}
 }
 
@@ -1965,11 +1949,11 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV
 	if (src_value->data[0].v_pointer) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1961 "FacebookPublishing.c"
+#line 1945 "FacebookPublishing.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1965 "FacebookPublishing.c"
+#line 1949 "FacebookPublishing.c"
 	}
 }
 
@@ -1977,37 +1961,37 @@ static void publishing_facebook_value_publishing_parameters_copy_value (const GV
 static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1973 "FacebookPublishing.c"
+#line 1957 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1980 "FacebookPublishing.c"
+#line 1964 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* object;
 		object = collect_values[0].v_pointer;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1987 "FacebookPublishing.c"
+#line 1971 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 1991 "FacebookPublishing.c"
+#line 1975 "FacebookPublishing.c"
 		}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1995 "FacebookPublishing.c"
+#line 1979 "FacebookPublishing.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1999 "FacebookPublishing.c"
+#line 1983 "FacebookPublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 2003 "FacebookPublishing.c"
+#line 1987 "FacebookPublishing.c"
 }
 
 
@@ -2018,25 +2002,25 @@ static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const
 	if (!object_p) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2014 "FacebookPublishing.c"
+#line 1998 "FacebookPublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 2020 "FacebookPublishing.c"
+#line 2004 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2024 "FacebookPublishing.c"
+#line 2008 "FacebookPublishing.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2028 "FacebookPublishing.c"
+#line 2012 "FacebookPublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 2032 "FacebookPublishing.c"
+#line 2016 "FacebookPublishing.c"
 }
 
 
@@ -2050,7 +2034,7 @@ GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2046 "FacebookPublishing.c"
+#line 2030 "FacebookPublishing.c"
 }
 
 
@@ -2059,7 +2043,7 @@ gpointer publishing_facebook_value_get_publishing_parameters (const GValue* valu
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2055 "FacebookPublishing.c"
+#line 2039 "FacebookPublishing.c"
 }
 
 
@@ -2079,17 +2063,17 @@ void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2075 "FacebookPublishing.c"
+#line 2059 "FacebookPublishing.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2079 "FacebookPublishing.c"
+#line 2063 "FacebookPublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2085 "FacebookPublishing.c"
+#line 2069 "FacebookPublishing.c"
 	}
 }
 
@@ -2108,17 +2092,17 @@ void publishing_facebook_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2104 "FacebookPublishing.c"
+#line 2088 "FacebookPublishing.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2108 "FacebookPublishing.c"
+#line 2092 "FacebookPublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2114 "FacebookPublishing.c"
+#line 2098 "FacebookPublishing.c"
 	}
 }
 
@@ -2128,14 +2112,14 @@ static void publishing_facebook_publishing_parameters_class_init (PublishingFace
 	publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2124 "FacebookPublishing.c"
+#line 2108 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 2131 "FacebookPublishing.c"
+#line 2115 "FacebookPublishing.c"
 }
 
 
@@ -2151,7 +2135,7 @@ static void publishing_facebook_publishing_parameters_finalize (PublishingFacebo
 	_g_free0 (self->new_album_name);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 2147 "FacebookPublishing.c"
+#line 2131 "FacebookPublishing.c"
 }
 
 
@@ -2176,7 +2160,7 @@ gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 2172 "FacebookPublishing.c"
+#line 2156 "FacebookPublishing.c"
 }
 
 
@@ -2189,7 +2173,7 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2185 "FacebookPublishing.c"
+#line 2169 "FacebookPublishing.c"
 	}
 }
 
@@ -2197,7 +2181,7 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) {
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2193 "FacebookPublishing.c"
+#line 2177 "FacebookPublishing.c"
 }
 
 
@@ -2242,14 +2226,14 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
 	g_signal_connect_object (_tmp4_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 2238 "FacebookPublishing.c"
+#line 2222 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host);
-#line 2245 "FacebookPublishing.c"
+#line 2229 "FacebookPublishing.c"
 }
 
 
@@ -2269,18 +2253,18 @@ static gboolean publishing_facebook_facebook_publisher_is_persistent_session_val
 	_tmp1_ = token;
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_ != NULL) {
-#line 2265 "FacebookPublishing.c"
+#line 2249 "FacebookPublishing.c"
 		const gchar* _tmp2_ = NULL;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = token;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_debug ("FacebookPublishing.vala:204: existing Facebook session found in config" \
 "uration database (access_token = %s).", _tmp2_);
-#line 2271 "FacebookPublishing.c"
+#line 2255 "FacebookPublishing.c"
 	} else {
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_debug ("FacebookPublishing.vala:207: no existing Facebook session available.");
-#line 2275 "FacebookPublishing.c"
+#line 2259 "FacebookPublishing.c"
 	}
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = token;
@@ -2290,7 +2274,7 @@ static gboolean publishing_facebook_facebook_publisher_is_persistent_session_val
 	_g_free0 (token);
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2285 "FacebookPublishing.c"
+#line 2269 "FacebookPublishing.c"
 }
 
 
@@ -2308,7 +2292,7 @@ static gchar* publishing_facebook_facebook_publisher_get_persistent_access_token
 	result = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2303 "FacebookPublishing.c"
+#line 2287 "FacebookPublishing.c"
 }
 
 
@@ -2326,7 +2310,7 @@ static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_meta
 	result = _tmp1_;
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2321 "FacebookPublishing.c"
+#line 2305 "FacebookPublishing.c"
 }
 
 
@@ -2343,7 +2327,7 @@ static void publishing_facebook_facebook_publisher_set_persistent_access_token (
 	_tmp1_ = access_token;
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_);
-#line 2338 "FacebookPublishing.c"
+#line 2322 "FacebookPublishing.c"
 }
 
 
@@ -2358,7 +2342,7 @@ static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata
 	_tmp1_ = strip_metadata;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 2353 "FacebookPublishing.c"
+#line 2337 "FacebookPublishing.c"
 }
 
 
@@ -2376,7 +2360,7 @@ gint publishing_facebook_facebook_publisher_get_persistent_default_size (Publish
 	result = _tmp1_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2371 "FacebookPublishing.c"
+#line 2355 "FacebookPublishing.c"
 }
 
 
@@ -2391,7 +2375,7 @@ void publishing_facebook_facebook_publisher_set_persistent_default_size (Publish
 	_tmp1_ = size;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 2386 "FacebookPublishing.c"
+#line 2370 "FacebookPublishing.c"
 }
 
 
@@ -2402,14 +2386,14 @@ static void publishing_facebook_facebook_publisher_invalidate_persistent_session
 	g_debug ("FacebookPublishing.vala:239: invalidating saved Facebook session.");
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_access_token (self, "");
-#line 2397 "FacebookPublishing.c"
+#line 2381 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback (gpointer self) {
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_login_clicked ((PublishingFacebookFacebookPublisher*) self);
-#line 2404 "FacebookPublishing.c"
+#line 2388 "FacebookPublishing.c"
 }
 
 
@@ -2428,21 +2412,21 @@ static void publishing_facebook_facebook_publisher_do_show_service_welcome_pane
 	_tmp1_ = self->priv->host;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
-#line 2423 "FacebookPublishing.c"
+#line 2407 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_endpoint_test_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2430 "FacebookPublishing.c"
+#line 2414 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_endpoint_test_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2437 "FacebookPublishing.c"
+#line 2421 "FacebookPublishing.c"
 }
 
 
@@ -2466,7 +2450,7 @@ static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoin
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _ ("Testing connection to Facebook...");
+	_tmp2_ = _ ("Testing connection to Facebook…");
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2485,21 +2469,21 @@ static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoin
 	publishing_facebook_graph_session_send_message (_tmp5_, endpoint_test_message);
 #line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (endpoint_test_message);
-#line 2479 "FacebookPublishing.c"
+#line 2463 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2486 "FacebookPublishing.c"
+#line 2470 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2493 "FacebookPublishing.c"
+#line 2477 "FacebookPublishing.c"
 }
 
 
@@ -2538,21 +2522,21 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
 	publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2532 "FacebookPublishing.c"
+#line 2516 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2539 "FacebookPublishing.c"
+#line 2523 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2546 "FacebookPublishing.c"
+#line 2530 "FacebookPublishing.c"
 }
 
 
@@ -2605,35 +2589,35 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
 	publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2599 "FacebookPublishing.c"
+#line 2583 "FacebookPublishing.c"
 }
 
 
 static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return g_boxed_copy (json_node_get_type (), self);
-#line 2606 "FacebookPublishing.c"
+#line 2590 "FacebookPublishing.c"
 }
 
 
 static gpointer __vala_JsonNode_copy0 (gpointer self) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2613 "FacebookPublishing.c"
+#line 2597 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2620 "FacebookPublishing.c"
+#line 2604 "FacebookPublishing.c"
 }
 
 
 static void _vala_JsonNode_free (JsonNode* self) {
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 2627 "FacebookPublishing.c"
+#line 2611 "FacebookPublishing.c"
 }
 
 
@@ -2646,7 +2630,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:293: ACTION: extracting user info from JSON re" \
 "sponse.");
-#line 2639 "FacebookPublishing.c"
+#line 2623 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2680,7 +2664,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2673 "FacebookPublishing.c"
+#line 2657 "FacebookPublishing.c"
 			goto __catch0_g_error;
 		}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2725,7 +2709,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		__vala_JsonNode_free0 (root);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2718 "FacebookPublishing.c"
+#line 2702 "FacebookPublishing.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -2758,7 +2742,7 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		_g_error_free0 (_error_);
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2751 "FacebookPublishing.c"
+#line 2735 "FacebookPublishing.c"
 	}
 	__finally0:
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2769,18 +2753,18 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		g_clear_error (&_inner_error_);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2762 "FacebookPublishing.c"
+#line 2746 "FacebookPublishing.c"
 	}
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2766 "FacebookPublishing.c"
+#line 2750 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_array_ref0 (gpointer self) {
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_array_ref (self) : NULL;
-#line 2773 "FacebookPublishing.c"
+#line 2757 "FacebookPublishing.c"
 }
 
 
@@ -2793,7 +2777,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:312: ACTION: extracting album info from JSON r" \
 "esponse.");
-#line 2785 "FacebookPublishing.c"
+#line 2769 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2827,7 +2811,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2819 "FacebookPublishing.c"
+#line 2803 "FacebookPublishing.c"
 			goto __catch1_g_error;
 		}
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2866,19 +2850,19 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		_tmp12_->albums_length1 = 0;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2858 "FacebookPublishing.c"
+#line 2842 "FacebookPublishing.c"
 		{
 			gint i = 0;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			i = 0;
-#line 2863 "FacebookPublishing.c"
+#line 2847 "FacebookPublishing.c"
 			{
 				gboolean _tmp14_ = FALSE;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp14_ = TRUE;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				while (TRUE) {
-#line 2870 "FacebookPublishing.c"
+#line 2854 "FacebookPublishing.c"
 					gint _tmp16_ = 0;
 					JsonArray* _tmp17_ = NULL;
 					guint _tmp18_ = 0U;
@@ -2900,13 +2884,13 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					const gchar* _tmp31_ = NULL;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!_tmp14_) {
-#line 2892 "FacebookPublishing.c"
+#line 2876 "FacebookPublishing.c"
 						gint _tmp15_ = 0;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp15_ = i;
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						i = _tmp15_ + 1;
-#line 2898 "FacebookPublishing.c"
+#line 2882 "FacebookPublishing.c"
 					}
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp14_ = FALSE;
@@ -2920,7 +2904,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					if (!(((guint) _tmp16_) < _tmp18_)) {
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						break;
-#line 2912 "FacebookPublishing.c"
+#line 2896 "FacebookPublishing.c"
 					}
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp19_ = album_list;
@@ -2962,7 +2946,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					_g_free0 (album_id);
 #line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_json_object_unref0 (current_album);
-#line 2954 "FacebookPublishing.c"
+#line 2938 "FacebookPublishing.c"
 				}
 			}
 		}
@@ -2974,7 +2958,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		__vala_JsonNode_free0 (root);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2966 "FacebookPublishing.c"
+#line 2950 "FacebookPublishing.c"
 	}
 	goto __finally1;
 	__catch1_g_error:
@@ -3007,7 +2991,7 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		_g_error_free0 (_error_);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2999 "FacebookPublishing.c"
+#line 2983 "FacebookPublishing.c"
 	}
 	__finally1:
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3018,25 +3002,25 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		g_clear_error (&_inner_error_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3010 "FacebookPublishing.c"
+#line 2994 "FacebookPublishing.c"
 	}
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 3014 "FacebookPublishing.c"
+#line 2998 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 3021 "FacebookPublishing.c"
+#line 3005 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3028 "FacebookPublishing.c"
+#line 3012 "FacebookPublishing.c"
 }
 
 
@@ -3070,7 +3054,7 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->host;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = _ ("Creating album...");
+	_tmp4_ = _ ("Creating album…");
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _tmp4_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3097,21 +3081,21 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 	publishing_facebook_graph_session_send_message (_tmp11_, create_album_message);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 3088 "FacebookPublishing.c"
+#line 3072 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 3095 "FacebookPublishing.c"
+#line 3079 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_publish ((PublishingFacebookFacebookPublisher*) self, target_album, privacy_setting, target_resolution, strip_metadata);
-#line 3102 "FacebookPublishing.c"
+#line 3086 "FacebookPublishing.c"
 }
 
 
@@ -3145,7 +3129,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	_tmp1_ = gtk_builder_new ();
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	builder = _tmp1_;
-#line 3136 "FacebookPublishing.c"
+#line 3120 "FacebookPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3154,7 +3138,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3145 "FacebookPublishing.c"
+#line 3129 "FacebookPublishing.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -3182,7 +3166,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		_tmp5_ = self->priv->host;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Facebook " \
-"can't continue.");
+"can’t continue.");
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3197,7 +3181,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		_g_object_unref0 (builder);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3187 "FacebookPublishing.c"
+#line 3171 "FacebookPublishing.c"
 	}
 	__finally2:
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3210,7 +3194,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3200 "FacebookPublishing.c"
+#line 3184 "FacebookPublishing.c"
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = self->priv->username;
@@ -3250,7 +3234,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	spit_publishing_plugin_host_install_dialog_pane (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3240 "FacebookPublishing.c"
+#line 3224 "FacebookPublishing.c"
 }
 
 
@@ -3266,7 +3250,7 @@ static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebook
 	self->priv->running = FALSE;
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3255 "FacebookPublishing.c"
+#line 3239 "FacebookPublishing.c"
 }
 
 
@@ -3280,7 +3264,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	g_return_if_fail (album_name != NULL);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 3269 "FacebookPublishing.c"
+#line 3253 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -3315,7 +3299,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 3304 "FacebookPublishing.c"
+#line 3288 "FacebookPublishing.c"
 			goto __catch3_g_error;
 		}
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3358,7 +3342,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		__vala_JsonNode_free0 (root);
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3347 "FacebookPublishing.c"
+#line 3331 "FacebookPublishing.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
@@ -3391,7 +3375,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		_g_error_free0 (_error_);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3380 "FacebookPublishing.c"
+#line 3364 "FacebookPublishing.c"
 	}
 	__finally3:
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3402,7 +3386,7 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		g_clear_error (&_inner_error_);
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3391 "FacebookPublishing.c"
+#line 3375 "FacebookPublishing.c"
 	}
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_params;
@@ -3412,21 +3396,21 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_upload (self);
-#line 3401 "FacebookPublishing.c"
+#line 3385 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded_publishing_facebook_web_authentication_pane_login_succeeded (PublishingFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) {
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded ((PublishingFacebookFacebookPublisher*) self, success_url);
-#line 3408 "FacebookPublishing.c"
+#line 3392 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed (PublishingFacebookWebAuthenticationPane* _sender, gpointer self) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed ((PublishingFacebookFacebookPublisher*) self);
-#line 3415 "FacebookPublishing.c"
+#line 3399 "FacebookPublishing.c"
 }
 
 
@@ -3465,7 +3449,7 @@ static void publishing_facebook_facebook_publisher_do_hosted_web_authentication
 	_tmp5_ = self->priv->web_auth_pane;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 3454 "FacebookPublishing.c"
+#line 3438 "FacebookPublishing.c"
 }
 
 
@@ -3492,7 +3476,7 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	_tmp3_ = _result_;
 #line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 3481 "FacebookPublishing.c"
+#line 3465 "FacebookPublishing.c"
 		gchar* _tmp4_ = NULL;
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -3500,13 +3484,13 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3489 "FacebookPublishing.c"
+#line 3473 "FacebookPublishing.c"
 	} else {
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3495 "FacebookPublishing.c"
+#line 3479 "FacebookPublishing.c"
 	}
 }
 
@@ -3540,7 +3524,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 3529 "FacebookPublishing.c"
+#line 3513 "FacebookPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3549,13 +3533,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 3538 "FacebookPublishing.c"
+#line 3522 "FacebookPublishing.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 3544 "FacebookPublishing.c"
+#line 3528 "FacebookPublishing.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3564,13 +3548,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 3553 "FacebookPublishing.c"
+#line 3537 "FacebookPublishing.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 3559 "FacebookPublishing.c"
+#line 3543 "FacebookPublishing.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3579,11 +3563,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 3568 "FacebookPublishing.c"
+#line 3552 "FacebookPublishing.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 3572 "FacebookPublishing.c"
+#line 3556 "FacebookPublishing.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -3591,7 +3575,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 3580 "FacebookPublishing.c"
+#line 3564 "FacebookPublishing.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3600,11 +3584,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 3589 "FacebookPublishing.c"
+#line 3573 "FacebookPublishing.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 3593 "FacebookPublishing.c"
+#line 3577 "FacebookPublishing.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -3626,7 +3610,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3615 "FacebookPublishing.c"
+#line 3599 "FacebookPublishing.c"
 }
 
 
@@ -3651,7 +3635,7 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 	_tmp3_ = _result_;
 #line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 3640 "FacebookPublishing.c"
+#line 3624 "FacebookPublishing.c"
 		gchar* _tmp4_ = NULL;
 #line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -3659,13 +3643,13 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3648 "FacebookPublishing.c"
+#line 3632 "FacebookPublishing.c"
 	} else {
 #line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
 #line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3654 "FacebookPublishing.c"
+#line 3638 "FacebookPublishing.c"
 	}
 }
 
@@ -3679,7 +3663,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3668 "FacebookPublishing.c"
+#line 3652 "FacebookPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3710,7 +3694,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3699 "FacebookPublishing.c"
+#line 3683 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3719,7 +3703,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3708 "FacebookPublishing.c"
+#line 3692 "FacebookPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3735,7 +3719,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3724 "FacebookPublishing.c"
+#line 3708 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3746,7 +3730,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3735 "FacebookPublishing.c"
+#line 3719 "FacebookPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3760,7 +3744,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3749 "FacebookPublishing.c"
+#line 3733 "FacebookPublishing.c"
 	}
 	goto __finally4;
 	__catch4_g_regex_error:
@@ -3774,7 +3758,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3763 "FacebookPublishing.c"
+#line 3747 "FacebookPublishing.c"
 	}
 	__finally4:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3785,7 +3769,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3774 "FacebookPublishing.c"
+#line 3758 "FacebookPublishing.c"
 	}
 }
 
@@ -3838,7 +3822,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 	_tmp5_ = index;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp5_ >= 0) {
-#line 3826 "FacebookPublishing.c"
+#line 3810 "FacebookPublishing.c"
 		const gchar* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
@@ -3861,13 +3845,13 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 		_g_free0 (access_token);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		access_token = _tmp11_;
-#line 3849 "FacebookPublishing.c"
+#line 3833 "FacebookPublishing.c"
 	}
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = access_token;
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp12_ == NULL) {
-#line 3855 "FacebookPublishing.c"
+#line 3839 "FacebookPublishing.c"
 		SpitPublishingPluginHost* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
@@ -3887,7 +3871,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 		_g_free0 (decoded_uri);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3875 "FacebookPublishing.c"
+#line 3859 "FacebookPublishing.c"
 	}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	trailing_params = NULL;
@@ -3901,7 +3885,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 	_tmp18_ = index;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp18_ >= 0) {
-#line 3889 "FacebookPublishing.c"
+#line 3873 "FacebookPublishing.c"
 		const gchar* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
 		const gchar* _tmp21_ = NULL;
@@ -3924,13 +3908,13 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 		_g_free0 (trailing_params);
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		trailing_params = _tmp24_;
-#line 3912 "FacebookPublishing.c"
+#line 3896 "FacebookPublishing.c"
 	}
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = trailing_params;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp25_ != NULL) {
-#line 3918 "FacebookPublishing.c"
+#line 3902 "FacebookPublishing.c"
 		const gchar* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
@@ -3944,7 +3928,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 		_g_free0 (access_token);
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		access_token = _tmp28_;
-#line 3932 "FacebookPublishing.c"
+#line 3916 "FacebookPublishing.c"
 	}
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = access_token;
@@ -3970,7 +3954,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 	_g_free0 (access_token);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (decoded_uri);
-#line 3958 "FacebookPublishing.c"
+#line 3942 "FacebookPublishing.c"
 }
 
 
@@ -3993,28 +3977,28 @@ static void publishing_facebook_facebook_publisher_do_save_session_information (
 	publishing_facebook_facebook_publisher_set_persistent_access_token (self, _tmp2_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 3980 "FacebookPublishing.c"
+#line 3964 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published);
-#line 3987 "FacebookPublishing.c"
+#line 3971 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) {
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3994 "FacebookPublishing.c"
+#line 3978 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete);
-#line 4001 "FacebookPublishing.c"
+#line 3985 "FacebookPublishing.c"
 }
 
 
@@ -4055,7 +4039,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	_tmp2_ = _tmp1_->target_album;
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 4042 "FacebookPublishing.c"
+#line 4026 "FacebookPublishing.c"
 		gchar* _tmp3_ = NULL;
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = g_strdup ("(none)");
@@ -4063,7 +4047,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp3_;
-#line 4050 "FacebookPublishing.c"
+#line 4034 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -4075,7 +4059,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 4062 "FacebookPublishing.c"
+#line 4046 "FacebookPublishing.c"
 	}
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:469: ACTION: uploading photos to album '%s'", _tmp0_);
@@ -4119,7 +4103,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4106 "FacebookPublishing.c"
+#line 4090 "FacebookPublishing.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = self->priv->host;
@@ -4161,7 +4145,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp0_);
-#line 4148 "FacebookPublishing.c"
+#line 4132 "FacebookPublishing.c"
 }
 
 
@@ -4180,7 +4164,7 @@ static void publishing_facebook_facebook_publisher_do_show_success_pane (Publish
 	_tmp1_ = self->priv->host;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4167 "FacebookPublishing.c"
+#line 4151 "FacebookPublishing.c"
 }
 
 
@@ -4194,7 +4178,7 @@ static void publishing_facebook_facebook_publisher_on_generic_error (PublishingF
 	if (g_error_matches (_tmp0_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
 #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_logout (self);
-#line 4181 "FacebookPublishing.c"
+#line 4165 "FacebookPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp1_ = NULL;
 		GError* _tmp2_ = NULL;
@@ -4204,7 +4188,7 @@ static void publishing_facebook_facebook_publisher_on_generic_error (PublishingF
 		_tmp2_ = _error_;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 4191 "FacebookPublishing.c"
+#line 4175 "FacebookPublishing.c"
 	}
 }
 
@@ -4219,14 +4203,14 @@ static void publishing_facebook_facebook_publisher_on_login_clicked (PublishingF
 	if (!_tmp0_) {
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4206 "FacebookPublishing.c"
+#line 4190 "FacebookPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:512: EVENT: user clicked 'Login' on welcome pa" \
 "ne.");
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (self);
-#line 4212 "FacebookPublishing.c"
+#line 4196 "FacebookPublishing.c"
 }
 
 
@@ -4258,14 +4242,14 @@ static void publishing_facebook_facebook_publisher_on_endpoint_test_completed (P
 	if (!_tmp4_) {
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4244 "FacebookPublishing.c"
+#line 4228 "FacebookPublishing.c"
 	}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:524: EVENT: endpoint test transaction detected" \
 " that the Facebook endpoint is alive.");
 #line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_hosted_web_authentication (self);
-#line 4250 "FacebookPublishing.c"
+#line 4234 "FacebookPublishing.c"
 }
 
 
@@ -4302,7 +4286,7 @@ static void publishing_facebook_facebook_publisher_on_endpoint_test_error (Publi
 	if (!_tmp4_) {
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4287 "FacebookPublishing.c"
+#line 4271 "FacebookPublishing.c"
 	}
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _error_;
@@ -4321,7 +4305,7 @@ static void publishing_facebook_facebook_publisher_on_endpoint_test_error (Publi
 	_tmp9_ = _error_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp9_);
-#line 4305 "FacebookPublishing.c"
+#line 4289 "FacebookPublishing.c"
 }
 
 
@@ -4338,7 +4322,7 @@ static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succee
 	if (!_tmp0_) {
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4322 "FacebookPublishing.c"
+#line 4306 "FacebookPublishing.c"
 	}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:547: EVENT: hosted web login succeeded.");
@@ -4346,7 +4330,7 @@ static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succee
 	_tmp1_ = success_url;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_authenticate_session (self, _tmp1_);
-#line 4330 "FacebookPublishing.c"
+#line 4314 "FacebookPublishing.c"
 }
 
 
@@ -4360,13 +4344,13 @@ static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed
 	if (!_tmp0_) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4344 "FacebookPublishing.c"
+#line 4328 "FacebookPublishing.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:558: EVENT: hosted web login failed.");
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_service_welcome_pane (self);
-#line 4350 "FacebookPublishing.c"
+#line 4334 "FacebookPublishing.c"
 }
 
 
@@ -4390,7 +4374,7 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 	if (!_tmp2_) {
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4374 "FacebookPublishing.c"
+#line 4358 "FacebookPublishing.c"
 	}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->graph_session;
@@ -4405,7 +4389,7 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 	publishing_facebook_facebook_publisher_do_save_session_information (self);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 4388 "FacebookPublishing.c"
+#line 4372 "FacebookPublishing.c"
 }
 
 
@@ -4443,7 +4427,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	if (!_tmp4_) {
 #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4426 "FacebookPublishing.c"
+#line 4410 "FacebookPublishing.c"
 	}
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
@@ -4466,7 +4450,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4448 "FacebookPublishing.c"
+#line 4432 "FacebookPublishing.c"
 }
 
 
@@ -4499,7 +4483,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	if (!_tmp4_) {
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4481 "FacebookPublishing.c"
+#line 4465 "FacebookPublishing.c"
 	}
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:602: EVENT: fetching user info generated and e" \
@@ -4508,7 +4492,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	_tmp5_ = _error_;
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4489 "FacebookPublishing.c"
+#line 4473 "FacebookPublishing.c"
 }
 
 
@@ -4524,7 +4508,7 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 	if (!_tmp0_) {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4505 "FacebookPublishing.c"
+#line 4489 "FacebookPublishing.c"
 	}
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->uid;
@@ -4535,7 +4519,7 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 "onse: uid = %s; name = %s.", _tmp1_, _tmp2_);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 4515 "FacebookPublishing.c"
+#line 4499 "FacebookPublishing.c"
 }
 
 
@@ -4573,7 +4557,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	if (!_tmp4_) {
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4553 "FacebookPublishing.c"
+#line 4537 "FacebookPublishing.c"
 	}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
@@ -4596,7 +4580,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4575 "FacebookPublishing.c"
+#line 4559 "FacebookPublishing.c"
 }
 
 
@@ -4629,7 +4613,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	if (!_tmp4_) {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4608 "FacebookPublishing.c"
+#line 4592 "FacebookPublishing.c"
 	}
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:637: EVENT: album description fetch attempt ge" \
@@ -4638,7 +4622,7 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	_tmp5_ = err;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4616 "FacebookPublishing.c"
+#line 4600 "FacebookPublishing.c"
 }
 
 
@@ -4655,7 +4639,7 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 	if (!_tmp0_) {
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4633 "FacebookPublishing.c"
+#line 4617 "FacebookPublishing.c"
 	}
 #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
@@ -4668,7 +4652,7 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 "rom JSON response", _tmp2__length1);
 #line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 4645 "FacebookPublishing.c"
+#line 4629 "FacebookPublishing.c"
 }
 
 
@@ -4698,14 +4682,14 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
 	if (!_tmp4_) {
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4675 "FacebookPublishing.c"
+#line 4659 "FacebookPublishing.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:659: EVENT: user clicked 'Logout' in publishin" \
 "g options pane.");
 #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_logout (self);
-#line 4681 "FacebookPublishing.c"
+#line 4665 "FacebookPublishing.c"
 }
 
 
@@ -4747,7 +4731,7 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	if (!_tmp4_) {
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4723 "FacebookPublishing.c"
+#line 4707 "FacebookPublishing.c"
 	}
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:672: EVENT: user clicked 'Publish' in publishi" \
@@ -4786,7 +4770,7 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	_tmp14_ = target_album;
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp14_ != NULL) {
-#line 4761 "FacebookPublishing.c"
+#line 4745 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		PublishingFacebookPublishingParameters* _tmp17_ = NULL;
@@ -4805,7 +4789,7 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 		if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_upload (self);
-#line 4780 "FacebookPublishing.c"
+#line 4764 "FacebookPublishing.c"
 		} else {
 			PublishingFacebookPublishingParameters* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -4822,12 +4806,12 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 			_tmp19_->new_album_name = _tmp21_;
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 4797 "FacebookPublishing.c"
+#line 4781 "FacebookPublishing.c"
 		}
 	} else {
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_upload (self);
-#line 4802 "FacebookPublishing.c"
+#line 4786 "FacebookPublishing.c"
 	}
 }
 
@@ -4876,7 +4860,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	if (!_tmp6_) {
 #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4851 "FacebookPublishing.c"
+#line 4835 "FacebookPublishing.c"
 	}
 #line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = message;
@@ -4903,7 +4887,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp11_, _tmp14_);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 4877 "FacebookPublishing.c"
+#line 4861 "FacebookPublishing.c"
 }
 
 
@@ -4936,7 +4920,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	if (!_tmp4_) {
 #line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4910 "FacebookPublishing.c"
+#line 4894 "FacebookPublishing.c"
 	}
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:719: EVENT: attempt to create new album genera" \
@@ -4945,7 +4929,7 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	_tmp5_ = err;
 #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4918 "FacebookPublishing.c"
+#line 4902 "FacebookPublishing.c"
 }
 
 
@@ -4966,7 +4950,7 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	if (!_tmp0_) {
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4939 "FacebookPublishing.c"
+#line 4923 "FacebookPublishing.c"
 	}
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -4989,7 +4973,7 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	_tmp5_ = completed_fraction;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4961 "FacebookPublishing.c"
+#line 4945 "FacebookPublishing.c"
 }
 
 
@@ -5022,7 +5006,7 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 	if (!_tmp4_) {
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4994 "FacebookPublishing.c"
+#line 4978 "FacebookPublishing.c"
 	}
 #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = num_published;
@@ -5031,7 +5015,7 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 "%d items published.", _tmp5_);
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 5002 "FacebookPublishing.c"
+#line 4986 "FacebookPublishing.c"
 }
 
 
@@ -5067,7 +5051,7 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	if (!_tmp4_) {
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5038 "FacebookPublishing.c"
+#line 5022 "FacebookPublishing.c"
 	}
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
@@ -5082,7 +5066,7 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	_tmp8_ = err;
 #line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 5052 "FacebookPublishing.c"
+#line 5036 "FacebookPublishing.c"
 }
 
 
@@ -5101,7 +5085,7 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 	result = _tmp1_;
 #line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5071 "FacebookPublishing.c"
+#line 5055 "FacebookPublishing.c"
 }
 
 
@@ -5116,7 +5100,7 @@ gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebo
 	result = _tmp0_;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5086 "FacebookPublishing.c"
+#line 5070 "FacebookPublishing.c"
 }
 
 
@@ -5131,7 +5115,7 @@ gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingF
 	result = _tmp0_;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5101 "FacebookPublishing.c"
+#line 5085 "FacebookPublishing.c"
 }
 
 
@@ -5148,7 +5132,7 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	if (_tmp0_) {
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5118 "FacebookPublishing.c"
+#line 5102 "FacebookPublishing.c"
 	}
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:775: FacebookPublisher: starting interaction.");
@@ -5164,7 +5148,7 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	_tmp2_ = publishing_facebook_facebook_publisher_is_persistent_session_valid (self);
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 5134 "FacebookPublishing.c"
+#line 5118 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -5178,14 +5162,14 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 		publishing_facebook_graph_session_authenticate (_tmp3_, _tmp5_);
 #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 5148 "FacebookPublishing.c"
+#line 5132 "FacebookPublishing.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = publishing_facebook_web_authentication_pane_is_cache_dirty ();
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp6_) {
-#line 5155 "FacebookPublishing.c"
+#line 5139 "FacebookPublishing.c"
 			SpitPublishingPluginHost* _tmp7_ = NULL;
 			SpitPublishingPluginHost* _tmp8_ = NULL;
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5196,11 +5180,11 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 			_tmp8_ = self->priv->host;
 #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 5166 "FacebookPublishing.c"
+#line 5150 "FacebookPublishing.c"
 		} else {
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_show_service_welcome_pane (self);
-#line 5170 "FacebookPublishing.c"
+#line 5154 "FacebookPublishing.c"
 		}
 	}
 }
@@ -5217,19 +5201,19 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl
 	_tmp0_ = self->priv->graph_session;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5187 "FacebookPublishing.c"
+#line 5171 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* _tmp1_ = NULL;
 #line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->graph_session;
 #line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 5193 "FacebookPublishing.c"
+#line 5177 "FacebookPublishing.c"
 	}
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 5199 "FacebookPublishing.c"
+#line 5183 "FacebookPublishing.c"
 }
 
 
@@ -5245,7 +5229,7 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
 	result = _tmp0_;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5215 "FacebookPublishing.c"
+#line 5199 "FacebookPublishing.c"
 }
 
 
@@ -5256,7 +5240,7 @@ static void publishing_facebook_facebook_publisher_class_init (PublishingFaceboo
 	g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 5226 "FacebookPublishing.c"
+#line 5210 "FacebookPublishing.c"
 }
 
 
@@ -5271,7 +5255,7 @@ static void publishing_facebook_facebook_publisher_spit_publishing_publisher_int
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_stop;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_is_running;
-#line 5241 "FacebookPublishing.c"
+#line 5225 "FacebookPublishing.c"
 }
 
 
@@ -5296,7 +5280,7 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace
 	self->priv->uid = NULL;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->username = NULL;
-#line 5266 "FacebookPublishing.c"
+#line 5250 "FacebookPublishing.c"
 }
 
 
@@ -5328,7 +5312,7 @@ static void publishing_facebook_facebook_publisher_finalize (GObject* obj) {
 	_g_free0 (self->priv->username);
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 5298 "FacebookPublishing.c"
+#line 5282 "FacebookPublishing.c"
 }
 
 
@@ -5346,124 +5330,35 @@ GType publishing_facebook_facebook_publisher_get_type (void) {
 }
 
 
-static void _publishing_facebook_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_on_page_load_changed ((PublishingFacebookWebAuthenticationPane*) self, load_event);
-#line 5319 "FacebookPublishing.c"
-}
-
-
-static gboolean __lambda4_ (PublishingFacebookWebAuthenticationPane* self) {
-	gboolean result = FALSE;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = TRUE;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5329 "FacebookPublishing.c"
-}
-
-
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
-	gboolean result;
-	result = __lambda4_ ((PublishingFacebookWebAuthenticationPane*) self);
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5338 "FacebookPublishing.c"
-}
-
-
 PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_construct (GType object_type) {
 	PublishingFacebookWebAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkScrolledWindow* _tmp1_ = NULL;
-	GtkScrolledWindow* _tmp2_ = NULL;
-	GtkScrolledWindow* _tmp3_ = NULL;
-	WebKitWebView* _tmp4_ = NULL;
-	WebKitWebView* _tmp5_ = NULL;
-	WebKitSettings* _tmp6_ = NULL;
-	WebKitWebView* _tmp7_ = NULL;
-	WebKitWebView* _tmp8_ = NULL;
-	GtkScrolledWindow* _tmp9_ = NULL;
-	WebKitWebView* _tmp10_ = NULL;
-	GtkBox* _tmp11_ = NULL;
-	GtkScrolledWindow* _tmp12_ = NULL;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = (PublishingFacebookWebAuthenticationPane*) g_object_new (object_type, NULL);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_object_ref_sink (_tmp1_);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->webview_frame);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->webview_frame = _tmp1_;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->webview_frame;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_scrolled_window_set_shadow_type (_tmp2_, GTK_SHADOW_ETCHED_IN);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->webview_frame;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_scrolled_window_set_policy (_tmp3_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = (WebKitWebView*) webkit_web_view_new ();
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_object_ref_sink (_tmp4_);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->webview = _tmp4_;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->webview;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = webkit_web_view_get_settings (_tmp5_);
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	webkit_settings_set_enable_plugins (_tmp6_, FALSE);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = self->priv->webview;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp7_, "load-changed", (GCallback) _publishing_facebook_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = self->priv->webview;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp8_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = self->priv->webview_frame;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = self->priv->webview;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = self->priv->pane_widget;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = self->priv->webview_frame;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = publishing_facebook_web_authentication_pane_get_login_url ();
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp1_ = _tmp0_;
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self = (PublishingFacebookWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp1_, NULL);
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_free0 (_tmp1_);
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 5419 "FacebookPublishing.c"
+#line 5314 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_new (void) {
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_web_authentication_pane_construct (PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE);
-#line 5426 "FacebookPublishing.c"
+#line 5321 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
-#line 5433 "FacebookPublishing.c"
+#line 5328 "FacebookPublishing.c"
 }
 
 
@@ -5483,11 +5378,11 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5453 "FacebookPublishing.c"
+#line 5348 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (PublishingFacebookWebAuthenticationPane* self) {
+static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) {
 	gchar* result = NULL;
 	const gchar* raw_system_locale = NULL;
 	const gchar* _tmp0_ = NULL;
@@ -5505,81 +5400,79 @@ static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_f
 	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL;
 	gint _tmp12__length1 = 0;
 	gchar* _tmp43_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE (self), NULL);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = setlocale (LC_ALL, "");
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	raw_system_locale = _tmp0_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = raw_system_locale;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == NULL) {
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = TRUE;
-#line 5487 "FacebookPublishing.c"
+#line 5380 "FacebookPublishing.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = raw_system_locale;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
-#line 5494 "FacebookPublishing.c"
+#line 5387 "FacebookPublishing.c"
 	}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_) {
-#line 5498 "FacebookPublishing.c"
+#line 5391 "FacebookPublishing.c"
 		gchar* _tmp4_ = NULL;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = g_strdup ("www");
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = _tmp4_;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 5506 "FacebookPublishing.c"
+#line 5399 "FacebookPublishing.c"
 	}
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = raw_system_locale;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ".", 0);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_[0];
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = g_strdup (_tmp9_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	system_locale = _tmp11_;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = self->priv->locale_lookup_table;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12__length1 = self->priv->locale_lookup_table_length1;
-#line 5530 "FacebookPublishing.c"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp12_ = publishing_facebook_web_authentication_pane_locale_lookup_table;
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp12__length1 = publishing_facebook_web_authentication_pane_locale_lookup_table_length1;
+#line 5423 "FacebookPublishing.c"
 	{
 		PublishingFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
 		gint locale_lookup_collection_length1 = 0;
 		gint _locale_lookup_collection_size_ = 0;
 		gint locale_lookup_it = 0;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		locale_lookup_collection = _tmp12_;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		locale_lookup_collection_length1 = _tmp12__length1;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) {
-#line 5542 "FacebookPublishing.c"
+#line 5435 "FacebookPublishing.c"
 			PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
 			PublishingFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp13_ = _publishing_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			locale_lookup = _tmp13_;
-#line 5549 "FacebookPublishing.c"
+#line 5442 "FacebookPublishing.c"
 			{
 				const gchar* _tmp14_ = NULL;
 				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
@@ -5592,465 +5485,336 @@ static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_f
 				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
 				const gchar* _tmp41_ = NULL;
 				gchar* _tmp42_ = NULL;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp14_ = system_locale;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp15_ = locale_lookup;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp16_ = _tmp15_->prefix;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!_tmp17_) {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					continue;
-#line 5576 "FacebookPublishing.c"
+#line 5469 "FacebookPublishing.c"
 				}
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp18_ = locale_lookup;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp19_ = _tmp18_->exception_code;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (_tmp19_ != NULL) {
-#line 5584 "FacebookPublishing.c"
+#line 5477 "FacebookPublishing.c"
 					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
 					const gchar* _tmp24_ = NULL;
 					gboolean _tmp25_ = FALSE;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp20_ = locale_lookup;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp21_ = _tmp20_->exception_translation;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp22_ = system_locale;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp23_ = locale_lookup;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp24_ = _tmp23_->exception_code;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp25_ = string_contains (_tmp22_, _tmp24_);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (_tmp25_) {
-#line 5607 "FacebookPublishing.c"
+#line 5500 "FacebookPublishing.c"
 						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
 						const gchar* _tmp27_ = NULL;
 						gchar* _tmp28_ = NULL;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp26_ = locale_lookup;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp27_ = _tmp26_->exception_translation;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp28_ = g_strdup (_tmp27_);
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						result = _tmp28_;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_g_free0 (system_locale);
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						return result;
-#line 5625 "FacebookPublishing.c"
+#line 5518 "FacebookPublishing.c"
 					}
 				}
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp29_ = locale_lookup;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp30_ = _tmp29_->exception_code_2;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (_tmp30_ != NULL) {
-#line 5634 "FacebookPublishing.c"
+#line 5527 "FacebookPublishing.c"
 					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
 					const gchar* _tmp32_ = NULL;
 					const gchar* _tmp33_ = NULL;
 					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
 					const gchar* _tmp35_ = NULL;
 					gboolean _tmp36_ = FALSE;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp31_ = locale_lookup;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp32_ = _tmp31_->exception_translation_2;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp33_ = system_locale;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp34_ = locale_lookup;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp35_ = _tmp34_->exception_code_2;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp36_ = string_contains (_tmp33_, _tmp35_);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (_tmp36_) {
-#line 5657 "FacebookPublishing.c"
+#line 5550 "FacebookPublishing.c"
 						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
 						const gchar* _tmp38_ = NULL;
 						gchar* _tmp39_ = NULL;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp37_ = locale_lookup;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp38_ = _tmp37_->exception_translation_2;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp39_ = g_strdup (_tmp38_);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						result = _tmp39_;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_g_free0 (system_locale);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						return result;
-#line 5675 "FacebookPublishing.c"
+#line 5568 "FacebookPublishing.c"
 					}
 				}
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp40_ = locale_lookup;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp41_ = _tmp40_->translation;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp42_ = g_strdup (_tmp41_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				result = _tmp42_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (system_locale);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				return result;
-#line 5692 "FacebookPublishing.c"
+#line 5585 "FacebookPublishing.c"
 			}
 		}
 	}
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = g_strdup ("www");
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp43_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (system_locale);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5704 "FacebookPublishing.c"
+#line 5597 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_web_authentication_pane_get_login_url (PublishingFacebookWebAuthenticationPane* self) {
+static gchar* publishing_facebook_web_authentication_pane_get_login_url (void) {
 	gchar* result = NULL;
 	gchar* facebook_locale = NULL;
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE (self), NULL);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (self);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale ();
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	facebook_locale = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup_printf ("https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https:/" \
 "/www.facebook.com/connect/login_success.html&display=popup&scope=publi" \
 "sh_actions,user_photos,user_videos&response_type=token", facebook_locale, PUBLISHING_FACEBOOK_APPLICATION_ID);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (facebook_locale);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5727 "FacebookPublishing.c"
+#line 5618 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_web_authentication_pane_on_page_load (PublishingFacebookWebAuthenticationPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
+static void publishing_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingFacebookWebAuthenticationPane * self;
 	gchar* loaded_url = NULL;
-	WebKitWebView* _tmp4_ = NULL;
-	const gchar* _tmp5_ = 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;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	const gchar* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	const gchar* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE (self));
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gchar* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	gboolean _tmp10_ = FALSE;
+	const gchar* _tmp22_ = NULL;
+	gboolean _tmp23_ = FALSE;
+	const gchar* _tmp28_ = NULL;
+	gboolean _tmp29_ = FALSE;
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp1_ = _tmp0_;
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp2_ = webkit_web_view_get_uri (_tmp1_);
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->webview;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = webkit_web_view_get_uri (_tmp4_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	loaded_url = _tmp7_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = loaded_url;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = g_strconcat ("loaded url: ", _tmp8_, NULL);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:950: %s", _tmp10_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = loaded_url;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = string_contains (_tmp11_, "?");
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp12_) {
-#line 5790 "FacebookPublishing.c"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = g_strdup (_tmp3_);
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (_tmp1_);
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	loaded_url = _tmp5_;
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp6_ = loaded_url;
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp7_ = g_strconcat ("loaded url: ", _tmp6_, NULL);
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp8_ = _tmp7_;
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:933: %s", _tmp8_);
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_free0 (_tmp8_);
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp9_ = loaded_url;
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp10_ = string_contains (_tmp9_, "?");
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp10_) {
+#line 5674 "FacebookPublishing.c"
 		gint index = 0;
+		const gchar* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
+		gchar* params = NULL;
 		const gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
-		gchar* params = NULL;
 		const gchar* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-		const gchar* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gint _tmp17_ = 0;
+		gchar* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		gchar* _tmp21_ = NULL;
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp11_ = loaded_url;
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp12_ = string_index_of_char (_tmp11_, (gunichar) '?', 0);
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		index = _tmp12_;
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = loaded_url;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = string_index_of_char (_tmp13_, (gunichar) '?', 0);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		index = _tmp14_;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp14_ = index;
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = loaded_url;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = index;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = loaded_url;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp18_ = strlen (_tmp17_);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = _tmp18_;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = string_slice (_tmp15_, (glong) _tmp16_, (glong) _tmp19_);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		params = _tmp20_;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp21_ = loaded_url;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp22_ = params;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp23_ = string_replace (_tmp21_, _tmp22_, "");
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp16_ = strlen (_tmp15_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp17_ = _tmp16_;
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp18_ = string_slice (_tmp13_, (glong) _tmp14_, (glong) _tmp17_);
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		params = _tmp18_;
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp19_ = loaded_url;
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp20_ = params;
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp21_ = string_replace (_tmp19_, _tmp20_, "");
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (loaded_url);
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		loaded_url = _tmp23_;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		loaded_url = _tmp21_;
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (params);
-#line 5836 "FacebookPublishing.c"
-	}
-#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = loaded_url;
-#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = string_contains (_tmp24_, "login_success");
-#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp25_) {
-#line 5844 "FacebookPublishing.c"
-		WebKitWebView* _tmp26_ = NULL;
+#line 5720 "FacebookPublishing.c"
+	}
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp22_ = loaded_url;
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp23_ = string_contains (_tmp22_, "login_success");
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp23_) {
+#line 5728 "FacebookPublishing.c"
+		WebKitWebView* _tmp24_ = NULL;
+		WebKitWebView* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_web_authentication_pane_cache_dirty = TRUE;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp26_ = self->priv->webview;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp27_ = webkit_web_view_get_uri (_tmp26_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp28_ = _tmp27_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (self, "login-succeeded", _tmp28_);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp24_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp25_ = _tmp24_;
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp26_ = webkit_web_view_get_uri (_tmp25_);
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp27_ = _tmp26_;
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		g_signal_emit_by_name (self, "login-succeeded", _tmp27_);
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_g_object_unref0 (_tmp25_);
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (loaded_url);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5862 "FacebookPublishing.c"
+#line 5751 "FacebookPublishing.c"
 	}
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = loaded_url;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = string_contains (_tmp29_, "login_failure");
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp30_) {
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp28_ = loaded_url;
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp29_ = string_contains (_tmp28_, "login_failure");
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp29_) {
+#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (self, "login-failed");
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (loaded_url);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5876 "FacebookPublishing.c"
+#line 5765 "FacebookPublishing.c"
 	}
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (loaded_url);
-#line 5880 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_on_load_started (PublishingFacebookWebAuthenticationPane* self) {
-	GtkBox* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE (self));
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 5903 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_on_page_load_changed (PublishingFacebookWebAuthenticationPane* self, WebKitLoadEvent load_event) {
-	WebKitLoadEvent _tmp0_ = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE (self));
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = load_event;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	switch (_tmp0_) {
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		case WEBKIT_LOAD_STARTED:
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		case WEBKIT_LOAD_REDIRECTED:
-#line 5919 "FacebookPublishing.c"
-		{
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			publishing_facebook_web_authentication_pane_on_load_started (self);
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			break;
-#line 5925 "FacebookPublishing.c"
-		}
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		case WEBKIT_LOAD_FINISHED:
-#line 5929 "FacebookPublishing.c"
-		{
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			publishing_facebook_web_authentication_pane_on_page_load (self);
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			break;
-#line 5935 "FacebookPublishing.c"
-		}
-		default:
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		break;
-#line 5940 "FacebookPublishing.c"
-	}
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return;
-#line 5944 "FacebookPublishing.c"
+#line 5769 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_web_authentication_pane_is_cache_dirty (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_web_authentication_pane_cache_dirty;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5957 "FacebookPublishing.c"
-}
-
-
-static GtkWidget* publishing_facebook_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5976 "FacebookPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_facebook_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5989 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-	WebKitWebView* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->webview;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_web_authentication_pane_get_login_url (self);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	webkit_web_view_load_uri (_tmp0_, _tmp2_);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 6010 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 6018 "FacebookPublishing.c"
+#line 5782 "FacebookPublishing.c"
 }
 
 
@@ -6068,288 +5832,288 @@ static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_
 	gchar* _tmp9_ = NULL;
 	const gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (translation != NULL, NULL);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = prefix;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->prefix);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->prefix = _tmp1_;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = translation;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->translation);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->translation = _tmp3_;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = exception_code;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_code);
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->exception_code = _tmp5_;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = exception_translation;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_translation);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->exception_translation = _tmp7_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = exception_code_2;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_code_2);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->exception_code_2 = _tmp9_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = exception_translation_2;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_translation_2);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->exception_translation_2 = _tmp11_;
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6092 "FacebookPublishing.c"
+#line 5856 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_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 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2);
-#line 6099 "FacebookPublishing.c"
+#line 5863 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6106 "FacebookPublishing.c"
+#line 5870 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer);
-#line 6115 "FacebookPublishing.c"
+#line 5879 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer);
-#line 6125 "FacebookPublishing.c"
+#line 5889 "FacebookPublishing.c"
 	} else {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6129 "FacebookPublishing.c"
+#line 5893 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6137 "FacebookPublishing.c"
+#line 5901 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6144 "FacebookPublishing.c"
+#line 5908 "FacebookPublishing.c"
 		PublishingFacebookWebAuthenticationPaneLocaleLookup* object;
 		object = collect_values[0].v_pointer;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6151 "FacebookPublishing.c"
+#line 5915 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 6155 "FacebookPublishing.c"
+#line 5919 "FacebookPublishing.c"
 		}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_web_authentication_pane_locale_lookup_ref (object);
-#line 6159 "FacebookPublishing.c"
+#line 5923 "FacebookPublishing.c"
 	} else {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6163 "FacebookPublishing.c"
+#line 5927 "FacebookPublishing.c"
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6167 "FacebookPublishing.c"
+#line 5931 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6178 "FacebookPublishing.c"
+#line 5942 "FacebookPublishing.c"
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 6184 "FacebookPublishing.c"
+#line 5948 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6188 "FacebookPublishing.c"
+#line 5952 "FacebookPublishing.c"
 	} else {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 6192 "FacebookPublishing.c"
+#line 5956 "FacebookPublishing.c"
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6196 "FacebookPublishing.c"
+#line 5960 "FacebookPublishing.c"
 }
 
 
 static GParamSpec* publishing_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup* spec;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6210 "FacebookPublishing.c"
+#line 5974 "FacebookPublishing.c"
 }
 
 
 static gpointer publishing_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6219 "FacebookPublishing.c"
+#line 5983 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 6239 "FacebookPublishing.c"
+#line 6003 "FacebookPublishing.c"
 	} else {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6243 "FacebookPublishing.c"
+#line 6007 "FacebookPublishing.c"
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6249 "FacebookPublishing.c"
+#line 6013 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6268 "FacebookPublishing.c"
+#line 6032 "FacebookPublishing.c"
 	} else {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6272 "FacebookPublishing.c"
+#line 6036 "FacebookPublishing.c"
 	}
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6278 "FacebookPublishing.c"
+#line 6042 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_web_authentication_pane_locale_lookup_class_init (PublishingFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_facebook_web_authentication_pane_locale_lookup_finalize;
-#line 6288 "FacebookPublishing.c"
+#line 6052 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingFacebookWebAuthenticationPaneLocaleLookup * self) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 6295 "FacebookPublishing.c"
+#line 6059 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_locale_lookup_finalize (PublishingFacebookWebAuthenticationPaneLocaleLookup* obj) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup * self;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookup);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->prefix);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->translation);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_code);
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_translation);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_code_2);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->exception_translation_2);
-#line 6317 "FacebookPublishing.c"
+#line 6081 "FacebookPublishing.c"
 }
 
 
@@ -6370,59 +6134,29 @@ static GType publishing_facebook_web_authentication_pane_locale_lookup_get_type
 static gpointer publishing_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
 	self = instance;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 6342 "FacebookPublishing.c"
+#line 6106 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
 	self = instance;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6355 "FacebookPublishing.c"
+#line 6119 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_web_authentication_pane_class_init (PublishingFacebookWebAuthenticationPaneClass * klass) {
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingFacebookWebAuthenticationPanePrivate));
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_web_authentication_pane_finalize;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("login_succeeded", PUBLISHING_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 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("login_failed", PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6371 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_web_authentication_pane_real_get_widget;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_facebook_web_authentication_pane_real_get_preferred_geometry;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_web_authentication_pane_real_on_pane_installed;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_web_authentication_pane_real_on_pane_uninstalled;
-#line 6386 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_instance_init (PublishingFacebookWebAuthenticationPane * self) {
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL;
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL;
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL;
@@ -6470,202 +6204,206 @@ static void publishing_facebook_web_authentication_pane_instance_init (Publishin
 	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL;
 	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv = PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->webview = NULL;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->webview_frame = NULL;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_facebook_web_authentication_pane_real_on_page_load;
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_web_authentication_pane_finalize;
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_new ("login_succeeded", PUBLISHING_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 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_new ("login_failed", PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("es", "es-la", "ES", "es-es", NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("en", "en-gb", "US", "en-us", NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("fr", "fr-fr", "CA", "fr-ca", NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pt", "pt-br", "PT", "pt-pt", NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw");
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("af", "af-za", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ar", "ar-ar", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("id", "id-id", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ms", "ms-my", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ca", "ca-es", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("cs", "cs-cz", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("cy", "cy-gb", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("da", "da-dk", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("de", "de-de", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("tl", "tl-ph", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ko", "ko-kr", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hr", "hr-hr", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("it", "it-it", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("lt", "lt-lt", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hu", "hu-hu", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nl", "nl-nl", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ja", "ja-jp", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pl", "pl-pl", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ro", "ro-ro", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ru", "ru-ru", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sk", "sk-sk", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sl", "sl-si", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sv", "sv-se", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("th", "th-th", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("vi", "vi-vn", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("tr", "tr-tr", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("el", "el-gr", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("bg", "bg-bg", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sr", "sr-rs", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp38_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("he", "he-il", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp39_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hi", "hi-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp40_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("bn", "bn-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp41_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pa", "pa-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp42_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ta", "ta-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("te", "te-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp44_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ml", "ml-in", NULL, NULL, NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_ = g_new0 (PublishingFacebookWebAuthenticationPaneLocaleLookup*, 45 + 1);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[0] = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[1] = _tmp1_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[2] = _tmp2_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[3] = _tmp3_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[4] = _tmp4_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[5] = _tmp5_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[6] = _tmp6_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[7] = _tmp7_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[8] = _tmp8_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[9] = _tmp9_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[10] = _tmp10_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[11] = _tmp11_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[12] = _tmp12_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[13] = _tmp13_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[14] = _tmp14_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[15] = _tmp15_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[16] = _tmp16_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[17] = _tmp17_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[18] = _tmp18_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[19] = _tmp19_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[20] = _tmp20_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[21] = _tmp21_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[22] = _tmp22_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[23] = _tmp23_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[24] = _tmp24_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[25] = _tmp25_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[26] = _tmp26_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[27] = _tmp27_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[28] = _tmp28_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[29] = _tmp29_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[30] = _tmp30_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[31] = _tmp31_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[32] = _tmp32_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[33] = _tmp33_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[34] = _tmp34_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[35] = _tmp35_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[36] = _tmp36_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[37] = _tmp37_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[38] = _tmp38_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[39] = _tmp39_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[40] = _tmp40_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[41] = _tmp41_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[42] = _tmp42_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[43] = _tmp43_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_[44] = _tmp44_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->locale_lookup_table = _tmp45_;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->locale_lookup_table_length1 = 45;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->_locale_lookup_table_size_ = self->priv->locale_lookup_table_length1;
-#line 6633 "FacebookPublishing.c"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_web_authentication_pane_locale_lookup_table = _tmp45_;
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_web_authentication_pane_locale_lookup_table_length1 = 45;
+#line 6367 "FacebookPublishing.c"
+}
+
+
+static void publishing_facebook_web_authentication_pane_instance_init (PublishingFacebookWebAuthenticationPane * self) {
 }
 
 
@@ -6673,17 +6411,9 @@ static void publishing_facebook_web_authentication_pane_finalize (GObject* obj)
 	PublishingFacebookWebAuthenticationPane * self;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->webview);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->webview_frame);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->locale_lookup_table = (_vala_array_free (self->priv->locale_lookup_table, self->priv->locale_lookup_table_length1, (GDestroyNotify) publishing_facebook_web_authentication_pane_locale_lookup_unref), NULL);
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_web_authentication_pane_parent_class)->finalize (obj);
-#line 6651 "FacebookPublishing.c"
+#line 6381 "FacebookPublishing.c"
 }
 
 
@@ -6691,10 +6421,8 @@ GType publishing_facebook_web_authentication_pane_get_type (void) {
 	static volatile gsize publishing_facebook_web_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_web_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_facebook_web_authentication_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_facebook_web_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_facebook_web_authentication_pane_type_id;
-		publishing_facebook_web_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingFacebookWebAuthenticationPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_facebook_web_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_facebook_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingFacebookWebAuthenticationPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_facebook_web_authentication_pane_type_id__volatile, publishing_facebook_web_authentication_pane_type_id);
 	}
 	return publishing_facebook_web_authentication_pane_type_id__volatile;
@@ -6704,56 +6432,56 @@ GType publishing_facebook_web_authentication_pane_get_type (void) {
 static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length) {
 	PublishingFacebookAlbum** result;
 	int i;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (PublishingFacebookAlbum*, length + 1);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6676 "FacebookPublishing.c"
+#line 6404 "FacebookPublishing.c"
 		PublishingFacebookAlbum* _tmp0_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 6682 "FacebookPublishing.c"
+#line 6410 "FacebookPublishing.c"
 	}
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 6686 "FacebookPublishing.c"
+#line 6414 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6693 "FacebookPublishing.c"
+#line 6421 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6700 "FacebookPublishing.c"
+#line 6428 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6707 "FacebookPublishing.c"
+#line 6435 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6714 "FacebookPublishing.c"
+#line 6442 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6721 "FacebookPublishing.c"
+#line 6449 "FacebookPublishing.c"
 }
 
 
@@ -6833,315 +6561,315 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	GtkRadioButton* _tmp70_ = NULL;
 	GtkComboBoxText* _tmp75_ = NULL;
 	SpitPublishingPublisherMediaType _tmp76_ = 0;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (publisher), NULL);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = builder;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = builder;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = builder;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = albums;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = albums_length1;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup2 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = _tmp8_;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = _tmp8__length1;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp9_);
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_facebook_publishing_options_pane_privacy_description_unref), NULL);
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = _tmp10_;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions_length1 = _tmp9_;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp11_);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = _tmp12_;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions_length1 = _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_possible_resolutions_size_ = self->priv->possible_resolutions_length1;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publisher;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = _g_object_ref0 (_tmp13_);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = _tmp14_;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = media_type;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->media_type = _tmp15_;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = builder;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "facebook_pane_box");
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_box_get_type (), GtkBox));
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = _tmp18_;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = self->priv->pane_widget;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_container_get_type (), GtkContainer), (guint) 16);
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->builder;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = _tmp22_;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->builder;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = gtk_builder_get_object (_tmp23_, "create_new_radio");
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = _tmp25_;
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->builder;
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = gtk_builder_get_object (_tmp26_, "existing_albums_combo");
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = _tmp28_;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->builder;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = gtk_builder_get_object (_tmp29_, "visibility_combo");
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = _tmp31_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = self->priv->builder;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = _tmp34_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = self->priv->builder;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = _tmp37_;
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp38_ = self->priv->builder;
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp39_ = gtk_builder_get_object (_tmp38_, "new_album_entry");
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_entry_get_type (), GtkEntry));
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->new_album_entry = _tmp40_;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp41_ = self->priv->builder;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp42_ = gtk_builder_get_object (_tmp41_, "resolution_combo");
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = _tmp43_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp44_ = self->priv->builder;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp45_ = gtk_builder_get_object (_tmp44_, "how_to_label");
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_label_get_type (), GtkLabel));
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->how_to_label = _tmp46_;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp47_ = self->priv->builder;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp48_ = gtk_builder_get_object (_tmp47_, "strip_metadata_check");
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->strip_metadata_check = _tmp49_;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp50_ = self->priv->create_new_radio;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp51_ = self->priv->use_existing_radio;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp52_ = username;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp53_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, _tmp52_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	label_text = _tmp53_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp54_ = media_type;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 7013 "FacebookPublishing.c"
+#line 6741 "FacebookPublishing.c"
 		const gchar* _tmp55_ = NULL;
 		gchar* _tmp56_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp55_ = label_text;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp56_ = g_strconcat (_tmp55_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (label_text);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		label_text = _tmp56_;
-#line 7024 "FacebookPublishing.c"
+#line 6752 "FacebookPublishing.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp57_ = self->priv->how_to_label;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp58_ = label_text;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_label_set_label (_tmp57_, _tmp58_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp59_ = self->priv->strip_metadata_check;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp60_ = strip_metadata;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp60_);
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_visibility_combo (self);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp61_ = self->priv->visibility_combo;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp62_ = self->priv->publish_button;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp63_ = self->priv->logout_button;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_resolution_combo (self);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp64_ = self->priv->resolution_combo;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp65_ = publisher;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp66_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp65_);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp66_);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp67_ = self->priv->resolution_combo;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp70_ = self->priv->create_new_radio;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp70_ != NULL) {
-#line 7070 "FacebookPublishing.c"
+#line 6798 "FacebookPublishing.c"
 		GtkRadioButton* _tmp71_ = NULL;
 		gboolean _tmp72_ = FALSE;
 		gboolean _tmp73_ = FALSE;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp71_ = self->priv->create_new_radio;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp73_ = _tmp72_;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp69_ = _tmp73_;
-#line 7082 "FacebookPublishing.c"
+#line 6810 "FacebookPublishing.c"
 	} else {
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp69_ = FALSE;
-#line 7086 "FacebookPublishing.c"
+#line 6814 "FacebookPublishing.c"
 	}
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp69_) {
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp68_ = TRUE;
-#line 7092 "FacebookPublishing.c"
+#line 6820 "FacebookPublishing.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp74_ = 0;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp74_ = media_type;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp68_ = (_tmp74_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 7099 "FacebookPublishing.c"
+#line 6827 "FacebookPublishing.c"
 	}
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp75_ = self->priv->visibility_combo;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), _tmp68_);
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp76_ = media_type;
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp76_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7109 "FacebookPublishing.c"
+#line 6837 "FacebookPublishing.c"
 		GtkCheckButton* _tmp77_ = NULL;
 		GtkCheckButton* _tmp78_ = NULL;
 		GtkComboBoxText* _tmp79_ = NULL;
@@ -7149,117 +6877,117 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 		GtkRadioButton* _tmp81_ = NULL;
 		GtkComboBoxText* _tmp82_ = NULL;
 		GtkEntry* _tmp83_ = NULL;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp77_ = self->priv->strip_metadata_check;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp78_ = self->priv->strip_metadata_check;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp79_ = self->priv->resolution_combo;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp80_ = self->priv->use_existing_radio;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp81_ = self->priv->create_new_radio;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = self->priv->existing_albums_combo;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp83_ = self->priv->new_album_entry;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7145 "FacebookPublishing.c"
+#line 6873 "FacebookPublishing.c"
 	}
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (label_text);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7151 "FacebookPublishing.c"
+#line 6879 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata) {
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata);
-#line 7158 "FacebookPublishing.c"
+#line 6886 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean result = FALSE;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->media_type;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7173 "FacebookPublishing.c"
+#line 6901 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 7180 "FacebookPublishing.c"
+#line 6908 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 7193 "FacebookPublishing.c"
+#line 6921 "FacebookPublishing.c"
 	{
 		PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection = _tmp0_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection_length1 = _tmp0__length1;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) {
-#line 7205 "FacebookPublishing.c"
+#line 6933 "FacebookPublishing.c"
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_ = NULL;
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			p = _tmp1_;
-#line 7212 "FacebookPublishing.c"
+#line 6940 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = self->priv->visibility_combo;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = p;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_->description;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 7227 "FacebookPublishing.c"
+#line 6955 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -7269,47 +6997,47 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) {
 	PublishingFacebookResolution* _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->possible_resolutions;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 7243 "FacebookPublishing.c"
+#line 6971 "FacebookPublishing.c"
 	{
 		PublishingFacebookResolution* res_collection = NULL;
 		gint res_collection_length1 = 0;
 		gint _res_collection_size_ = 0;
 		gint res_it = 0;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection = _tmp0_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection_length1 = _tmp0__length1;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) {
-#line 7255 "FacebookPublishing.c"
+#line 6983 "FacebookPublishing.c"
 			PublishingFacebookResolution res = 0;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			res = res_collection[res_it];
-#line 7259 "FacebookPublishing.c"
+#line 6987 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp1_ = NULL;
 				PublishingFacebookResolution _tmp2_ = 0;
 				gchar* _tmp3_ = NULL;
 				gchar* _tmp4_ = NULL;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = self->priv->resolution_combo;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = res;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = publishing_facebook_resolution_get_name (_tmp2_);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_;
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp4_);
-#line 7277 "FacebookPublishing.c"
+#line 7005 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -7320,41 +7048,41 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->use_existing_radio;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7298 "FacebookPublishing.c"
+#line 7026 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkComboBoxText* _tmp5_ = NULL;
 		SpitPublishingPublisherMediaType _tmp6_ = 0;
 		GtkComboBoxText* _tmp7_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->visibility_combo;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->media_type;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), (_tmp6_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->existing_albums_combo;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 7322 "FacebookPublishing.c"
+#line 7050 "FacebookPublishing.c"
 	}
 }
 
@@ -7363,38 +7091,38 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->create_new_radio;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7341 "FacebookPublishing.c"
+#line 7069 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
 		GtkComboBoxText* _tmp6_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->new_album_entry;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->visibility_combo;
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7362 "FacebookPublishing.c"
+#line 7090 "FacebookPublishing.c"
 	}
 }
 
@@ -7403,26 +7131,26 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
 	PublishingFacebookFacebookPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->resolution_combo;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 7381 "FacebookPublishing.c"
+#line 7109 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7390 "FacebookPublishing.c"
+#line 7118 "FacebookPublishing.c"
 }
 
 
@@ -7443,29 +7171,29 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 	PublishingFacebookResolution _tmp21_ = 0;
 	GtkCheckButton* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->privacy_setting;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	privacy_setting = _tmp5_;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 7433 "FacebookPublishing.c"
+#line 7161 "FacebookPublishing.c"
 		PublishingFacebookResolution* _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
 		GtkComboBoxText* _tmp8_ = NULL;
@@ -7474,131 +7202,131 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		GtkRadioButton* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->possible_resolutions;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7__length1 = self->priv->possible_resolutions_length1;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->resolution_combo;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = _tmp7_[_tmp9_];
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = _tmp10_;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->use_existing_radio;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp13_) {
-#line 7462 "FacebookPublishing.c"
+#line 7190 "FacebookPublishing.c"
 			GtkComboBoxText* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp14_ = self->priv->existing_albums_combo;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = gtk_combo_box_text_get_active_text (_tmp14_);
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp15_;
-#line 7473 "FacebookPublishing.c"
+#line 7201 "FacebookPublishing.c"
 		} else {
 			GtkEntry* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp16_ = self->priv->new_album_entry;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp18_;
-#line 7488 "FacebookPublishing.c"
+#line 7216 "FacebookPublishing.c"
 		}
 	} else {
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = PUBLISHING_FACEBOOK_RESOLUTION_STANDARD;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_name);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_name = NULL;
-#line 7497 "FacebookPublishing.c"
+#line 7225 "FacebookPublishing.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = album_name;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = privacy_setting;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = resolution_setting;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = self->priv->strip_metadata_check;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp19_, _tmp20_, _tmp21_, _tmp23_);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (privacy_setting);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (album_name);
-#line 7515 "FacebookPublishing.c"
+#line 7243 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7526 "FacebookPublishing.c"
+#line 7254 "FacebookPublishing.c"
 	}
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7532 "FacebookPublishing.c"
+#line 7260 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7543 "FacebookPublishing.c"
+#line 7271 "FacebookPublishing.c"
 	}
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7549 "FacebookPublishing.c"
+#line 7277 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7560 "FacebookPublishing.c"
+#line 7288 "FacebookPublishing.c"
 	}
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7566 "FacebookPublishing.c"
+#line 7294 "FacebookPublishing.c"
 }
 
 
@@ -7622,91 +7350,91 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookPublishingOptionsPanePrivacyDescription*, 0 + 1);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _ ("Just me");
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp2_, "{ 'value' : 'SELF' }");
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _result_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _ ("Friends");
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp5_, "{ 'value' : 'ALL_FRIENDS' }");
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _result_;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _ ("Everyone");
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp8_, "{ 'value' : 'EVERYONE' }");
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _result_;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 7638 "FacebookPublishing.c"
+#line 7366 "FacebookPublishing.c"
 	}
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp10_;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7644 "FacebookPublishing.c"
+#line 7372 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7655 "FacebookPublishing.c"
+#line 7383 "FacebookPublishing.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7659 "FacebookPublishing.c"
+#line 7387 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7670 "FacebookPublishing.c"
+#line 7398 "FacebookPublishing.c"
 	}
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7674 "FacebookPublishing.c"
+#line 7402 "FacebookPublishing.c"
 }
 
 
@@ -7722,120 +7450,120 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 	gint _tmp2__length1 = 0;
 	PublishingFacebookResolution* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookResolution, 0);
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _result_;
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _result__length1;
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = _result__length1;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp3__length1;
-#line 7720 "FacebookPublishing.c"
+#line 7448 "FacebookPublishing.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7726 "FacebookPublishing.c"
+#line 7454 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkButton* _tmp24_ = NULL;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 7739 "FacebookPublishing.c"
+#line 7467 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->albums;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1__length1 = self->priv->albums_length1;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp1__length1 == 0) {
-#line 7748 "FacebookPublishing.c"
+#line 7476 "FacebookPublishing.c"
 			GtkRadioButton* _tmp2_ = NULL;
 			GtkEntry* _tmp3_ = NULL;
 			GtkComboBoxText* _tmp4_ = NULL;
 			GtkRadioButton* _tmp5_ = NULL;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = self->priv->create_new_radio;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp3_ = self->priv->new_album_entry;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_entry_set_text (_tmp3_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp4_ = self->priv->existing_albums_combo;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp5_ = self->priv->use_existing_radio;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7769 "FacebookPublishing.c"
+#line 7497 "FacebookPublishing.c"
 		} else {
 			gint default_album_seq_num = 0;
 			gint ticker = 0;
 			PublishingFacebookAlbum** _tmp6_ = NULL;
 			gint _tmp6__length1 = 0;
 			gint _tmp15_ = 0;
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			default_album_seq_num = -1;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			ticker = 0;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6_ = self->priv->albums;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6__length1 = self->priv->albums_length1;
-#line 7784 "FacebookPublishing.c"
+#line 7512 "FacebookPublishing.c"
 			{
 				PublishingFacebookAlbum** album_collection = NULL;
 				gint album_collection_length1 = 0;
 				gint _album_collection_size_ = 0;
 				gint album_it = 0;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection = _tmp6_;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection_length1 = _tmp6__length1;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) {
-#line 7796 "FacebookPublishing.c"
+#line 7524 "FacebookPublishing.c"
 					PublishingFacebookAlbum* _tmp7_ = NULL;
 					PublishingFacebookAlbum* album = NULL;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album = _tmp7_;
-#line 7803 "FacebookPublishing.c"
+#line 7531 "FacebookPublishing.c"
 					{
 						GtkComboBoxText* _tmp8_ = NULL;
 						PublishingFacebookAlbum* _tmp9_ = NULL;
@@ -7843,101 +7571,101 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 						PublishingFacebookAlbum* _tmp11_ = NULL;
 						const gchar* _tmp12_ = NULL;
 						gint _tmp14_ = 0;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp8_ = self->priv->existing_albums_combo;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp9_ = album;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp10_ = _tmp9_->name;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						gtk_combo_box_text_append_text (_tmp8_, _tmp10_);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp11_ = album;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp12_ = _tmp11_->name;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 7825 "FacebookPublishing.c"
+#line 7553 "FacebookPublishing.c"
 							gint _tmp13_ = 0;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							_tmp13_ = ticker;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							default_album_seq_num = _tmp13_;
-#line 7831 "FacebookPublishing.c"
+#line 7559 "FacebookPublishing.c"
 						}
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp14_ = ticker;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						ticker = _tmp14_ + 1;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_album_unref0 (album);
-#line 7839 "FacebookPublishing.c"
+#line 7567 "FacebookPublishing.c"
 					}
 				}
 			}
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = default_album_seq_num;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp15_ != -1) {
-#line 7847 "FacebookPublishing.c"
+#line 7575 "FacebookPublishing.c"
 				GtkComboBoxText* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
 				GtkRadioButton* _tmp18_ = NULL;
 				GtkEntry* _tmp19_ = NULL;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp16_ = self->priv->existing_albums_combo;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp17_ = default_album_seq_num;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp18_ = self->priv->use_existing_radio;
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp19_ = self->priv->new_album_entry;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7866 "FacebookPublishing.c"
+#line 7594 "FacebookPublishing.c"
 			} else {
 				GtkRadioButton* _tmp20_ = NULL;
 				GtkComboBoxText* _tmp21_ = NULL;
 				GtkComboBoxText* _tmp22_ = NULL;
 				GtkEntry* _tmp23_ = NULL;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp20_ = self->priv->create_new_radio;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp21_ = self->priv->existing_albums_combo;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp22_ = self->priv->existing_albums_combo;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp23_ = self->priv->new_album_entry;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 7888 "FacebookPublishing.c"
+#line 7616 "FacebookPublishing.c"
 			}
 		}
 	}
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = self->priv->publish_button;
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 7896 "FacebookPublishing.c"
+#line 7624 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self) {
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7905 "FacebookPublishing.c"
+#line 7633 "FacebookPublishing.c"
 }
 
 
@@ -7947,23 +7675,23 @@ static void publishing_facebook_publishing_options_pane_notify_publish (Publishi
 	PublishingFacebookResolution _tmp2_ = 0;
 	GtkCheckButton* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = target_album;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = privacy_setting;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = target_resolution;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->strip_metadata_check;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 7931 "FacebookPublishing.c"
+#line 7659 "FacebookPublishing.c"
 }
 
 
@@ -7972,58 +7700,58 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7950 "FacebookPublishing.c"
+#line 7678 "FacebookPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7963 "FacebookPublishing.c"
+#line 7691 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 7970 "FacebookPublishing.c"
+#line 7698 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_publish ((PublishingFacebookPublishingOptionsPane*) self, target_album, privacy_setting, target_resolution);
-#line 7977 "FacebookPublishing.c"
+#line 7705 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_installed (self);
-#line 7991 "FacebookPublishing.c"
+#line 7719 "FacebookPublishing.c"
 }
 
 
@@ -8031,17 +7759,17 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
 	PublishingFacebookPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 8009 "FacebookPublishing.c"
+#line 7737 "FacebookPublishing.c"
 }
 
 
@@ -8052,27 +7780,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8028 "FacebookPublishing.c"
+#line 7756 "FacebookPublishing.c"
 	} else {
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 8034 "FacebookPublishing.c"
+#line 7762 "FacebookPublishing.c"
 	}
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_enum (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8040 "FacebookPublishing.c"
+#line 7768 "FacebookPublishing.c"
 }
 
 
@@ -8082,248 +7810,248 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy_setting != NULL, NULL);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = description;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->description = _tmp1_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy_setting;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->privacy_setting = _tmp3_;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8074 "FacebookPublishing.c"
+#line 7802 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_options_pane_privacy_description_construct (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 8081 "FacebookPublishing.c"
+#line 7809 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8088 "FacebookPublishing.c"
+#line 7816 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 8097 "FacebookPublishing.c"
+#line 7825 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 8107 "FacebookPublishing.c"
+#line 7835 "FacebookPublishing.c"
 	} else {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8111 "FacebookPublishing.c"
+#line 7839 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8119 "FacebookPublishing.c"
+#line 7847 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8126 "FacebookPublishing.c"
+#line 7854 "FacebookPublishing.c"
 		PublishingFacebookPublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8133 "FacebookPublishing.c"
+#line 7861 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 8137 "FacebookPublishing.c"
+#line 7865 "FacebookPublishing.c"
 		}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object);
-#line 8141 "FacebookPublishing.c"
+#line 7869 "FacebookPublishing.c"
 	} else {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8145 "FacebookPublishing.c"
+#line 7873 "FacebookPublishing.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8149 "FacebookPublishing.c"
+#line 7877 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8160 "FacebookPublishing.c"
+#line 7888 "FacebookPublishing.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8166 "FacebookPublishing.c"
+#line 7894 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8170 "FacebookPublishing.c"
+#line 7898 "FacebookPublishing.c"
 	} else {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 8174 "FacebookPublishing.c"
+#line 7902 "FacebookPublishing.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8178 "FacebookPublishing.c"
+#line 7906 "FacebookPublishing.c"
 }
 
 
 static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription* spec;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8192 "FacebookPublishing.c"
+#line 7920 "FacebookPublishing.c"
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8201 "FacebookPublishing.c"
+#line 7929 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 8221 "FacebookPublishing.c"
+#line 7949 "FacebookPublishing.c"
 	} else {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8225 "FacebookPublishing.c"
+#line 7953 "FacebookPublishing.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 8231 "FacebookPublishing.c"
+#line 7959 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8250 "FacebookPublishing.c"
+#line 7978 "FacebookPublishing.c"
 	} else {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8254 "FacebookPublishing.c"
+#line 7982 "FacebookPublishing.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 8260 "FacebookPublishing.c"
+#line 7988 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 8270 "FacebookPublishing.c"
+#line 7998 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8277 "FacebookPublishing.c"
+#line 8005 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingFacebookPublishingOptionsPanePrivacyDescription);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 8291 "FacebookPublishing.c"
+#line 8019 "FacebookPublishing.c"
 }
 
 
@@ -8344,134 +8072,134 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8316 "FacebookPublishing.c"
+#line 8044 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8329 "FacebookPublishing.c"
+#line 8057 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass) {
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookPublishingOptionsPanePrivate));
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_publishing_options_pane_finalize;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN);
-#line 8345 "FacebookPublishing.c"
+#line 8073 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_widget;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled;
-#line 8360 "FacebookPublishing.c"
+#line 8088 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self) {
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = NULL;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = NULL;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->new_album_entry = NULL;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->how_to_label = NULL;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = NULL;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = 0;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = NULL;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = NULL;
-#line 8397 "FacebookPublishing.c"
+#line 8125 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_facebook_publishing_options_pane_privacy_description_unref), NULL);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 8439 "FacebookPublishing.c"
+#line 8167 "FacebookPublishing.c"
 }
 
 
@@ -8491,52 +8219,52 @@ GType publishing_facebook_publishing_options_pane_get_type (void) {
 
 gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 	gchar* result = NULL;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 8463 "FacebookPublishing.c"
+#line 8191 "FacebookPublishing.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = g_strdup ("https://graph.facebook.com/");
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp0_;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8472 "FacebookPublishing.c"
+#line 8200 "FacebookPublishing.c"
 		}
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 8476 "FacebookPublishing.c"
+#line 8204 "FacebookPublishing.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup ("https://graph-video.facebook.com/");
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8485 "FacebookPublishing.c"
+#line 8213 "FacebookPublishing.c"
 		}
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 8489 "FacebookPublishing.c"
+#line 8217 "FacebookPublishing.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = g_strdup ("https://www.facebook.com/");
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp2_;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8498 "FacebookPublishing.c"
+#line 8226 "FacebookPublishing.c"
 		}
 		default:
 		{
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_assert_not_reached ();
-#line 8504 "FacebookPublishing.c"
+#line 8232 "FacebookPublishing.c"
 		}
 	}
 }
@@ -8555,48 +8283,48 @@ GType publishing_facebook_endpoint_get_type (void) {
 
 
 static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_uri'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8527 "FacebookPublishing.c"
+#line 8255 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 8536 "FacebookPublishing.c"
+#line 8264 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_response_body'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8545 "FacebookPublishing.c"
+#line 8273 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 8554 "FacebookPublishing.c"
+#line 8282 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type) {
 	PublishingFacebookGraphMessage* self = NULL;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8564 "FacebookPublishing.c"
+#line 8292 "FacebookPublishing.c"
 }
 
 
@@ -8607,243 +8335,243 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8583 "FacebookPublishing.c"
+#line 8311 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 8589 "FacebookPublishing.c"
+#line 8317 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 8595 "FacebookPublishing.c"
+#line 8323 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_init (GValue* value) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8602 "FacebookPublishing.c"
+#line 8330 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_free_value (GValue* value) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 8611 "FacebookPublishing.c"
+#line 8339 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_message_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_message_ref (src_value->data[0].v_pointer);
-#line 8621 "FacebookPublishing.c"
+#line 8349 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8625 "FacebookPublishing.c"
+#line 8353 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8633 "FacebookPublishing.c"
+#line 8361 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8640 "FacebookPublishing.c"
+#line 8368 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* object;
 		object = collect_values[0].v_pointer;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8647 "FacebookPublishing.c"
+#line 8375 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 8651 "FacebookPublishing.c"
+#line 8379 "FacebookPublishing.c"
 		}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 8655 "FacebookPublishing.c"
+#line 8383 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8659 "FacebookPublishing.c"
+#line 8387 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8663 "FacebookPublishing.c"
+#line 8391 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookGraphMessage** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8674 "FacebookPublishing.c"
+#line 8402 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8680 "FacebookPublishing.c"
+#line 8408 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8684 "FacebookPublishing.c"
+#line 8412 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8688 "FacebookPublishing.c"
+#line 8416 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8692 "FacebookPublishing.c"
+#line 8420 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecGraphMessage* spec;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8706 "FacebookPublishing.c"
+#line 8434 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8715 "FacebookPublishing.c"
+#line 8443 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8735 "FacebookPublishing.c"
+#line 8463 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8739 "FacebookPublishing.c"
+#line 8467 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8745 "FacebookPublishing.c"
+#line 8473 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8764 "FacebookPublishing.c"
+#line 8492 "FacebookPublishing.c"
 	} else {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8768 "FacebookPublishing.c"
+#line 8496 "FacebookPublishing.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8774 "FacebookPublishing.c"
+#line 8502 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_message_parent_class = g_type_class_peek_parent (klass);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_message_real_get_uri;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_message_real_get_response_body;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("data_transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 8794 "FacebookPublishing.c"
+#line 8522 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8801 "FacebookPublishing.c"
+#line 8529 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphMessage * self;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 8811 "FacebookPublishing.c"
+#line 8539 "FacebookPublishing.c"
 }
 
 
@@ -8864,86 +8592,86 @@ GType publishing_facebook_graph_message_get_type (void) {
 gpointer publishing_facebook_graph_message_ref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8836 "FacebookPublishing.c"
+#line 8564 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_message_unref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8849 "FacebookPublishing.c"
+#line 8577 "FacebookPublishing.c"
 	}
 }
 
 
 static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 8857 "FacebookPublishing.c"
+#line 8585 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type) {
 	PublishingFacebookGraphSession* self = NULL;
-	SoupSessionAsync* _tmp0_ = NULL;
+	SoupSession* _tmp0_ = NULL;
 	SoupSession* _tmp1_ = NULL;
 	SoupSession* _tmp2_ = NULL;
 	SoupSession* _tmp3_ = NULL;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSession*) g_type_create_instance (object_type);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = (SoupSessionAsync*) soup_session_async_new ();
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = soup_session_new ();
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->soup_session = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, soup_session_get_type (), SoupSession);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->soup_session = _tmp0_;
+#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->soup_session;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp1_, "request-unqueued", (GCallback) _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued, self);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->soup_session;
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp2_, "timeout", (guint) 15, NULL);
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = NULL;
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->soup_session;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8897 "FacebookPublishing.c"
+#line 8625 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 8904 "FacebookPublishing.c"
+#line 8632 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 8911 "FacebookPublishing.c"
+#line 8639 "FacebookPublishing.c"
 }
 
 
@@ -8951,48 +8679,48 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
 	PublishingFacebookGraphMessage* _tmp1_ = NULL;
 	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ == NULL, "current_message == null");
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = msg;
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _publishing_facebook_graph_message_ref0 (_tmp1_);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = _tmp2_;
-#line 8935 "FacebookPublishing.c"
+#line 8663 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 8953 "FacebookPublishing.c"
+#line 8681 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk);
-#line 8960 "FacebookPublishing.c"
+#line 8688 "FacebookPublishing.c"
 }
 
 
@@ -9019,149 +8747,149 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 	guint _tmp27_ = 0U;
 	GError* _tmp68_ = NULL;
 	GError* _tmp80_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_message;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp2_;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = real_message;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->soup_message;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = msg;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp4_ == _tmp5_, "real_message.soup_message == msg");
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = msg;
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp8_, "status-code", &_tmp9_, NULL);
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = TRUE;
-#line 9019 "FacebookPublishing.c"
+#line 8747 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		guint _tmp13_ = 0U;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = msg;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp11_, "status-code", &_tmp12_, NULL);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 9032 "FacebookPublishing.c"
+#line 8760 "FacebookPublishing.c"
 	}
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_) {
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 9038 "FacebookPublishing.c"
+#line 8766 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = msg;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp14_, "status-code", &_tmp15_, NULL);
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _tmp15_;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 9051 "FacebookPublishing.c"
+#line 8779 "FacebookPublishing.c"
 	}
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 9055 "FacebookPublishing.c"
+#line 8783 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_ = NULL;
 		SoupSession* _tmp18_ = NULL;
 		SoupMessage* _tmp19_ = NULL;
 		SoupMessage* _tmp20_ = NULL;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = real_message;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_->bytes_so_far = 0;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = self->priv->soup_session;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = msg;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp18_, _tmp20_, NULL, NULL);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_publishing_facebook_graph_message_unref0 (real_message);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 9076 "FacebookPublishing.c"
+#line 8804 "FacebookPublishing.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = real_message;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_unmanage_message (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = msg;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = real_message;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp24_, NULL, FALSE);
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, _tmp23_);
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_error_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = msg;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp25_, "status-code", &_tmp26_, NULL);
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (_tmp27_) {
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_OK:
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CREATED:
-#line 9104 "FacebookPublishing.c"
+#line 8832 "FacebookPublishing.c"
 		{
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9108 "FacebookPublishing.c"
+#line 8836 "FacebookPublishing.c"
 		}
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 9112 "FacebookPublishing.c"
+#line 8840 "FacebookPublishing.c"
 		{
 			GError* _tmp28_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp28_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp28_;
-#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9123 "FacebookPublishing.c"
+#line 8851 "FacebookPublishing.c"
 		}
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 9129 "FacebookPublishing.c"
+#line 8857 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
@@ -9170,35 +8898,35 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp33_ = 0U;
 			guint _tmp34_ = 0U;
 			GError* _tmp35_ = NULL;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp29_ = real_message;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp30_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp31_ = _tmp30_;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp32_ = msg;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp32_, "status-code", &_tmp33_, NULL);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp34_ = _tmp33_;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp35_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp31_, _tmp34_);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp35_;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp31_);
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9160 "FacebookPublishing.c"
+#line 8888 "FacebookPublishing.c"
 		}
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT:
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 9166 "FacebookPublishing.c"
+#line 8894 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
@@ -9207,44 +8935,44 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp40_ = 0U;
 			guint _tmp41_ = 0U;
 			GError* _tmp42_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp36_ = real_message;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp37_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp38_ = _tmp37_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp39_ = msg;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp39_, "status-code", &_tmp40_, NULL);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp41_ = _tmp40_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp42_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp38_, _tmp41_);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp42_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp38_);
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9197 "FacebookPublishing.c"
+#line 8925 "FacebookPublishing.c"
 		}
 		default:
 		{
 			SoupMessage* _tmp43_ = NULL;
 			guint _tmp44_ = 0U;
 			guint _tmp45_ = 0U;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp43_ = msg;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp43_, "status-code", &_tmp44_, NULL);
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp45_ = _tmp44_;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp45_ >= ((guint) 100)) {
-#line 9212 "FacebookPublishing.c"
+#line 8940 "FacebookPublishing.c"
 				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_ = NULL;
 				gchar* _tmp47_ = NULL;
 				gchar* _tmp48_ = NULL;
@@ -9256,37 +8984,37 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
 				GError* _tmp56_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp46_ = real_message;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp47_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp48_ = _tmp47_;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp49_ = msg;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp49_, "status-code", &_tmp50_, NULL);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp51_ = _tmp50_;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp52_ = msg;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp52_, "reason-phrase", &_tmp53_, NULL);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp54_ = _tmp53_;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp55_ = _tmp54_;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp56_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp48_, _tmp51_, _tmp55_);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp56_;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp55_);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp48_);
-#line 9254 "FacebookPublishing.c"
+#line 8982 "FacebookPublishing.c"
 			} else {
 				SoupMessage* _tmp57_ = NULL;
 				gchar* _tmp58_ = NULL;
@@ -9299,172 +9027,172 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				guint _tmp65_ = 0U;
 				guint _tmp66_ = 0U;
 				GError* _tmp67_ = NULL;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp57_ = msg;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp57_, "reason-phrase", &_tmp58_, NULL);
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp59_ = _tmp58_;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp60_ = _tmp59_;
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_debug ("FacebookPublishing.vala:1544: %s", _tmp60_);
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+				g_debug ("FacebookPublishing.vala:1494: %s", _tmp60_);
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp60_);
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp61_ = real_message;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp62_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp63_ = _tmp62_;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp64_ = msg;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp64_, "status-code", &_tmp65_, NULL);
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp66_ = _tmp65_;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp67_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp63_, _tmp66_);
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp67_;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp63_);
-#line 9299 "FacebookPublishing.c"
+#line 9027 "FacebookPublishing.c"
 			}
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9303 "FacebookPublishing.c"
+#line 9031 "FacebookPublishing.c"
 		}
 	}
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = _error_;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp68_ == NULL) {
-#line 9310 "FacebookPublishing.c"
+#line 9038 "FacebookPublishing.c"
 		gboolean _tmp69_ = FALSE;
 		SoupMessage* _tmp70_ = NULL;
 		SoupMessageBody* _tmp71_ = NULL;
 		guint8* _tmp72_ = NULL;
 		gint _tmp72__length1 = 0;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp70_ = msg;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp71_ = _tmp70_->response_body;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72__length1 = (gint) _tmp71_->length;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp72_ == NULL) {
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = TRUE;
-#line 9328 "FacebookPublishing.c"
+#line 9056 "FacebookPublishing.c"
 		} else {
 			SoupMessage* _tmp73_ = NULL;
 			SoupMessageBody* _tmp74_ = NULL;
 			guint8* _tmp75_ = NULL;
 			gint _tmp75__length1 = 0;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp73_ = msg;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp74_ = _tmp73_->response_body;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75_ = _tmp74_->data;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75__length1 = (gint) _tmp74_->length;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = _tmp75__length1 == 0;
-#line 9344 "FacebookPublishing.c"
+#line 9072 "FacebookPublishing.c"
 		}
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp69_) {
-#line 9348 "FacebookPublishing.c"
+#line 9076 "FacebookPublishing.c"
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_ = NULL;
 			gchar* _tmp77_ = NULL;
 			gchar* _tmp78_ = NULL;
 			GError* _tmp79_ = NULL;
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp76_ = real_message;
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp77_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp78_ = _tmp77_;
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp79_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp78_);
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp79_;
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp78_);
-#line 9367 "FacebookPublishing.c"
+#line 9095 "FacebookPublishing.c"
 		}
 	}
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _error_;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp80_ == NULL) {
-#line 9374 "FacebookPublishing.c"
+#line 9102 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_ = NULL;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp81_ = real_message;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "completed");
-#line 9380 "FacebookPublishing.c"
+#line 9108 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_ = NULL;
 		GError* _tmp83_ = NULL;
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = real_message;
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp83_ = _error_;
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp83_);
-#line 9390 "FacebookPublishing.c"
+#line 9118 "FacebookPublishing.c"
 	}
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_error_free0 (_error_);
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9396 "FacebookPublishing.c"
+#line 9124 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (access_token != NULL);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = access_token;
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = _tmp1_;
-#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 9417 "FacebookPublishing.c"
+#line 9145 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), FALSE);
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_ != NULL;
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9432 "FacebookPublishing.c"
+#line 9160 "FacebookPublishing.c"
 }
 
 
@@ -9473,36 +9201,36 @@ gchar* publishing_facebook_graph_session_get_access_token (PublishingFacebookGra
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_graph_session_is_authenticated (self);
-#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->access_token;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp2_;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9455 "FacebookPublishing.c"
+#line 9183 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_endpoint_test (PublishingFacebookGraphSession* self) {
 	PublishingFacebookGraphMessage* result = NULL;
 	PublishingFacebookGraphSessionGraphEndpointProbeMessage* _tmp0_ = NULL;
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_graph_session_graph_endpoint_probe_message_new (self);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9470 "FacebookPublishing.c"
+#line 9198 "FacebookPublishing.c"
 }
 
 
@@ -9511,21 +9239,21 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (Pub
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_ = NULL;
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = resource_path;
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->access_token;
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_graph_session_graph_query_message_new (self, _tmp0_, _tmp1_);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9493 "FacebookPublishing.c"
+#line 9221 "FacebookPublishing.c"
 }
 
 
@@ -9537,29 +9265,29 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
 	gboolean _tmp3_ = FALSE;
 	const gchar* _tmp4_ = NULL;
 	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_ = NULL;
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = resource_path;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishable;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = suppress_titling;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = resource_privacy;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_graph_session_graph_upload_message_new (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9527 "FacebookPublishing.c"
+#line 9255 "FacebookPublishing.c"
 }
 
 
@@ -9569,25 +9297,25 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy != NULL, NULL);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = album_name;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, _tmp1_, _tmp2_);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9555 "FacebookPublishing.c"
+#line 9283 "FacebookPublishing.c"
 }
 
 
@@ -9605,81 +9333,81 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess
 	gchar* _tmp9_ = NULL;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp1_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = real_message;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_->soup_message;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = soup_message_get_uri (_tmp3_);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = soup_uri_to_string (_tmp5_, FALSE);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = g_strconcat ("making HTTP request to URI: ", _tmp7_, NULL);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:1599: %s", _tmp9_);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:1549: %s", _tmp9_);
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = real_message;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp11_) {
-#line 9611 "FacebookPublishing.c"
+#line 9339 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* _tmp12_ = NULL;
 		SoupSession* _tmp13_ = NULL;
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_ = NULL;
 		SoupMessage* _tmp15_ = NULL;
 		SoupMessage* _tmp16_ = NULL;
-#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = message;
-#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_manage_message (self, _tmp12_);
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = self->priv->soup_session;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = real_message;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_->soup_message;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 9631 "FacebookPublishing.c"
+#line 9359 "FacebookPublishing.c"
 	}
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9635 "FacebookPublishing.c"
+#line 9363 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
 	SoupSession* _tmp0_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_session_abort (_tmp0_);
-#line 9647 "FacebookPublishing.c"
+#line 9375 "FacebookPublishing.c"
 }
 
 
@@ -9693,39 +9421,39 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 	PublishingFacebookEndpoint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphMessageImpl*) publishing_facebook_graph_message_construct (object_type);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = method;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->method = _tmp0_;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->access_token = _tmp2_;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->host_session = _tmp3_;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = 0;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = endpoint;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	endpoint_uri = _tmp5_;
-#line 9693 "FacebookPublishing.c"
+#line 9421 "FacebookPublishing.c"
 	{
 		GRegex* starting_slashes = NULL;
 		GRegex* _tmp6_ = NULL;
@@ -9737,129 +9465,129 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		starting_slashes = _tmp6_;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9713 "FacebookPublishing.c"
+#line 9441 "FacebookPublishing.c"
 				goto __catch5_g_regex_error;
 			}
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			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 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9724 "FacebookPublishing.c"
+#line 9452 "FacebookPublishing.c"
 		}
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = starting_slashes;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = relative_uri;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = g_regex_replace (_tmp8_, _tmp9_, (gssize) -1, 0, "", 0, &_inner_error_);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9740 "FacebookPublishing.c"
+#line 9468 "FacebookPublishing.c"
 				goto __catch5_g_regex_error;
 			}
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			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 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9753 "FacebookPublishing.c"
+#line 9481 "FacebookPublishing.c"
 		}
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = endpoint_uri;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp7_;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strconcat (_tmp11_, _tmp13_, NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->uri);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->uri = _tmp14_;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_regex_unref0 (starting_slashes);
-#line 9775 "FacebookPublishing.c"
+#line 9503 "FacebookPublishing.c"
 	}
 	goto __finally5;
 	__catch5_g_regex_error:
 	{
 		GError* err = NULL;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		err = _inner_error_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (err);
-#line 9789 "FacebookPublishing.c"
+#line 9517 "FacebookPublishing.c"
 	}
 	__finally5:
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (endpoint_uri);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 9802 "FacebookPublishing.c"
+#line 9530 "FacebookPublishing.c"
 	}
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (endpoint_uri);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9808 "FacebookPublishing.c"
+#line 9536 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
 	gboolean result = FALSE;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = TRUE;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9818 "FacebookPublishing.c"
+#line 9546 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self), FALSE);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_GET_CLASS (self)->prepare_for_transmission (self);
-#line 9827 "FacebookPublishing.c"
+#line 9555 "FacebookPublishing.c"
 }
 
 
@@ -9868,17 +9596,17 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->uri;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9846 "FacebookPublishing.c"
+#line 9574 "FacebookPublishing.c"
 }
 
 
@@ -9890,23 +9618,23 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
 	guint8* _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	gchar* _tmp3_ = NULL;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->soup_message;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _tmp0_->response_body;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->data;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = (gint) _tmp1_->length;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup ((const gchar*) _tmp2_);
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9874 "FacebookPublishing.c"
+#line 9602 "FacebookPublishing.c"
 }
 
 
@@ -9918,44 +9646,44 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
 	SoupMessage* _tmp4_ = NULL;
 	SoupMessageBody* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self));
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (chunk != NULL);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->bytes_so_far;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = chunk;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->length;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = _tmp0_ + ((gint) _tmp2_);
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->bytes_so_far;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->soup_message;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_->request_body;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->length;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "data-transmitted", _tmp3_, (gint) _tmp6_);
-#line 9908 "FacebookPublishing.c"
+#line 9636 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass) {
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_session_graph_message_impl_real_get_uri;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
-#line 9923 "FacebookPublishing.c"
+#line 9651 "FacebookPublishing.c"
 }
 
 
@@ -9965,17 +9693,17 @@ static void publishing_facebook_graph_session_graph_message_impl_instance_init (
 
 static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->uri);
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->soup_message);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_message_impl_parent_class)->finalize (obj);
-#line 9943 "FacebookPublishing.c"
+#line 9671 "FacebookPublishing.c"
 }
 
 
@@ -9992,9 +9720,9 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 9962 "FacebookPublishing.c"
+#line 9690 "FacebookPublishing.c"
 }
 
 
@@ -10017,79 +9745,79 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
 	gchar* _tmp13_ = NULL;
 	SoupMessage* _tmp14_ = NULL;
 	SoupMessage* _tmp15_ = NULL;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = relative_uri;
-#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = access_token;
-#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphQueryMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, _tmp1_, _tmp2_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = g_strconcat (_tmp3_, "?access_token=", NULL);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = access_token;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	destination_uri = _tmp10_;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = _tmp12_;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = soup_message_new_from_uri (_tmp13_, destination_uri);
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp14_;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp13_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp15_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (destination_uri);
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10043 "FacebookPublishing.c"
+#line 9771 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_query_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, host_session, relative_uri, access_token);
-#line 10050 "FacebookPublishing.c"
+#line 9778 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_query_message_parent_class = g_type_class_peek_parent (klass);
-#line 10057 "FacebookPublishing.c"
+#line 9785 "FacebookPublishing.c"
 }
 
 
@@ -10120,55 +9848,55 @@ static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_faceb
 	SoupURI* _tmp6_ = NULL;
 	SoupMessage* _tmp7_ = NULL;
 	SoupMessage* _tmp8_ = NULL;
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphEndpointProbeMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "/", "", PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = soup_uri_new (_tmp4_);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp7_;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp6_);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp8_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10122 "FacebookPublishing.c"
+#line 9850 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
-#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_endpoint_probe_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, host_session);
-#line 10129 "FacebookPublishing.c"
+#line 9857 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_endpoint_probe_message_parent_class = g_type_class_peek_parent (klass);
-#line 10136 "FacebookPublishing.c"
+#line 9864 "FacebookPublishing.c"
 }
 
 
@@ -10199,21 +9927,21 @@ static gchar* g_date_time_to_string (GDateTime* self) {
 	result = _tmp0_;
 #line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 10167 "FacebookPublishing.c"
+#line 9895 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 10174 "FacebookPublishing.c"
+#line 9902 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 10181 "FacebookPublishing.c"
+#line 9909 "FacebookPublishing.c"
 }
 
 
@@ -10286,64 +10014,64 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	SoupMessage* _tmp79_ = NULL;
 	SoupMessageBody* _tmp80_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishable;
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = spit_publishing_publishable_get_media_type (_tmp1_);
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 10270 "FacebookPublishing.c"
+#line 9998 "FacebookPublishing.c"
 	} else {
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 10274 "FacebookPublishing.c"
+#line 10002 "FacebookPublishing.c"
 	}
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = relative_uri;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = access_token;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphUploadMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, _tmp4_, _tmp5_, _tmp0_);
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = publishable;
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 10292 "FacebookPublishing.c"
+#line 10020 "FacebookPublishing.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = resource_privacy;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp9_ != NULL;
-#line 10299 "FacebookPublishing.c"
+#line 10027 "FacebookPublishing.c"
 	}
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO ||                 resource_privacy != null");
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishable;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 10311 "FacebookPublishing.c"
+#line 10039 "FacebookPublishing.c"
 	{
 		GMappedFile* _tmp12_ = NULL;
 		SpitPublishingPublishable* _tmp13_ = NULL;
@@ -10354,330 +10082,330 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		GMappedFile* _tmp18_ = NULL;
 		GMappedFile* _tmp19_ = NULL;
 		GMappedFile* _tmp20_ = NULL;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = publishable;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = spit_publishing_publishable_get_serialized_file (_tmp13_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = g_file_get_path (_tmp15_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_mapped_file_new (_tmp17_, FALSE, &_inner_error_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp17_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp19_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 10346 "FacebookPublishing.c"
+#line 10074 "FacebookPublishing.c"
 				goto __catch6_g_file_error;
 			}
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			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 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 10355 "FacebookPublishing.c"
+#line 10083 "FacebookPublishing.c"
 		}
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _tmp12_;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = NULL;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->mapped_file = _tmp20_;
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (_tmp12_);
-#line 10367 "FacebookPublishing.c"
+#line 10095 "FacebookPublishing.c"
 	}
 	goto __finally6;
 	__catch6_g_file_error:
 	{
 		GError* e = NULL;
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
-#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return self;
-#line 10381 "FacebookPublishing.c"
+#line 10109 "FacebookPublishing.c"
 	}
 	__finally6:
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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);
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 10392 "FacebookPublishing.c"
+#line 10120 "FacebookPublishing.c"
 	}
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishing_rest_support_http_method_to_string (_tmp21_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = soup_uri_new (_tmp24_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = _tmp25_;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = soup_message_new_from_uri (_tmp23_, _tmp26_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp27_;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp26_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp23_);
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp28_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->mapped_file;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = g_mapped_file_get_contents (_tmp29_);
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload = (guint8*) _tmp30_;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = -1;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_payload_size_ = payload_length1;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = self->priv->mapped_file;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = g_mapped_file_get_length (_tmp31_);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = (gint) _tmp32_;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = payload_length1;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = payload;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34__length1 = payload_length1;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	image_data = _tmp35_;
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = soup_multipart_new ("multipart/form-data");
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp36_;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = mp_envelope;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp38_ = access_token;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (_tmp37_, "access_token", _tmp38_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp39_ = publishable;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 10462 "FacebookPublishing.c"
+#line 10190 "FacebookPublishing.c"
 		SoupMultipart* _tmp41_ = NULL;
 		const gchar* _tmp42_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp41_ = mp_envelope;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp42_ = resource_privacy;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 10471 "FacebookPublishing.c"
+#line 10199 "FacebookPublishing.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = publishable;
-#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, "title");
-#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_title = _tmp44_;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp46_ = suppress_titling;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp46_) {
-#line 10483 "FacebookPublishing.c"
+#line 10211 "FacebookPublishing.c"
 		const gchar* _tmp47_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp47_ = publishable_title;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = _tmp47_ != NULL;
-#line 10489 "FacebookPublishing.c"
+#line 10217 "FacebookPublishing.c"
 	} else {
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = FALSE;
-#line 10493 "FacebookPublishing.c"
+#line 10221 "FacebookPublishing.c"
 	}
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp45_) {
-#line 10497 "FacebookPublishing.c"
+#line 10225 "FacebookPublishing.c"
 		SoupMultipart* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
-#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp48_ = mp_envelope;
-#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp49_ = publishable_title;
-#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 10506 "FacebookPublishing.c"
+#line 10234 "FacebookPublishing.c"
 	}
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp50_ = publishable;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, "comment");
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_comment = _tmp51_;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp53_ = suppress_titling;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp53_) {
-#line 10518 "FacebookPublishing.c"
+#line 10246 "FacebookPublishing.c"
 		const gchar* _tmp54_ = NULL;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp54_ = publishable_comment;
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = _tmp54_ != NULL;
-#line 10524 "FacebookPublishing.c"
+#line 10252 "FacebookPublishing.c"
 	} else {
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = FALSE;
-#line 10528 "FacebookPublishing.c"
+#line 10256 "FacebookPublishing.c"
 	}
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp52_) {
-#line 10532 "FacebookPublishing.c"
+#line 10260 "FacebookPublishing.c"
 		SoupMultipart* _tmp55_ = NULL;
 		const gchar* _tmp56_ = NULL;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp55_ = mp_envelope;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp56_ = publishable_comment;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 10541 "FacebookPublishing.c"
+#line 10269 "FacebookPublishing.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp57_ = suppress_titling;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp57_) {
-#line 10547 "FacebookPublishing.c"
+#line 10275 "FacebookPublishing.c"
 		SoupMultipart* _tmp58_ = NULL;
 		SpitPublishingPublishable* _tmp59_ = NULL;
 		GDateTime* _tmp60_ = NULL;
 		GDateTime* _tmp61_ = NULL;
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp58_ = mp_envelope;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp59_ = publishable;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp60_ = spit_publishing_publishable_get_exposure_date_time (_tmp59_);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp61_ = _tmp60_;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp62_ = g_date_time_to_string (_tmp61_);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp63_ = _tmp62_;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp58_, "backdated_time", _tmp63_);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp63_);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_date_time_unref0 (_tmp61_);
-#line 10572 "FacebookPublishing.c"
+#line 10300 "FacebookPublishing.c"
 	}
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp65_ = publishable;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp66_ = spit_publishing_publishable_get_media_type (_tmp65_);
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "video";
-#line 10582 "FacebookPublishing.c"
+#line 10310 "FacebookPublishing.c"
 	} else {
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "image/jpeg";
-#line 10586 "FacebookPublishing.c"
+#line 10314 "FacebookPublishing.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp67_ = g_strdup (_tmp64_);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	source_file_mime_type = _tmp67_;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = mp_envelope;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp69_ = publishable;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp70_ = spit_publishing_publishable_get_serialized_file (_tmp69_);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp71_ = _tmp70_;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp72_ = g_file_get_basename (_tmp71_);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp73_ = _tmp72_;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp74_ = source_file_mime_type;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp75_ = image_data;
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_file (_tmp68_, "source", _tmp73_, _tmp74_, _tmp75_);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp73_);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (_tmp71_);
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp76_ = mp_envelope;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp77_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp78_ = _tmp77_->request_headers;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp79_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _tmp79_->request_body;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (_tmp76_, _tmp78_, _tmp80_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (source_file_mime_type);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_comment);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_title);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupBuffer_free0 (image_data);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10638 "FacebookPublishing.c"
+#line 10366 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_upload_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, host_session, access_token, relative_uri, publishable, suppress_titling, resource_privacy);
-#line 10645 "FacebookPublishing.c"
+#line 10373 "FacebookPublishing.c"
 }
 
 
@@ -10685,13 +10413,13 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 	gboolean result = FALSE;
 	GMappedFile* _tmp0_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
-#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->mapped_file;
-#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 10659 "FacebookPublishing.c"
+#line 10387 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -10701,82 +10429,82 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->publishable;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = spit_publishing_publishable_get_serialized_file (_tmp1_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_strdup_printf ("File %s is unavailable.", _tmp5_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp9_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp9_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = FALSE;
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10701 "FacebookPublishing.c"
+#line 10429 "FacebookPublishing.c"
 	} else {
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = TRUE;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10707 "FacebookPublishing.c"
+#line 10435 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass) {
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_upload_message_parent_class = g_type_class_peek_parent (klass);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_upload_message_finalize;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
-#line 10721 "FacebookPublishing.c"
+#line 10449 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self) {
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->mapped_file = NULL;
-#line 10730 "FacebookPublishing.c"
+#line 10458 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_upload_message_parent_class)->finalize (obj);
-#line 10744 "FacebookPublishing.c"
+#line 10472 "FacebookPublishing.c"
 }
 
 
@@ -10814,105 +10542,105 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 	SoupMessageHeaders* _tmp17_ = NULL;
 	SoupMessage* _tmp18_ = NULL;
 	SoupMessageBody* _tmp19_ = NULL;
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_privacy != NULL, NULL);
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphCreateAlbumMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "/me/albums", _tmp1_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = album_privacy;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 10800 "FacebookPublishing.c"
+#line 10528 "FacebookPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = album_privacy;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 10806 "FacebookPublishing.c"
+#line 10534 "FacebookPublishing.c"
 	} else {
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = FALSE;
-#line 10810 "FacebookPublishing.c"
+#line 10538 "FacebookPublishing.c"
 	}
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_rest_support_http_method_to_string (_tmp5_);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = soup_message_new_from_uri (_tmp7_, _tmp10_);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp11_;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp10_);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = soup_multipart_new ("multipart/form-data");
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp12_;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = access_token;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "access_token", _tmp13_);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = album_name;
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "name", _tmp14_);
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = album_privacy;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "privacy", _tmp15_);
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = _tmp16_->request_headers;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = _tmp18_->request_body;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (mp_envelope, _tmp17_, _tmp19_);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10866 "FacebookPublishing.c"
+#line 10594 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_create_album_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_CREATE_ALBUM_MESSAGE, host_session, access_token, album_name, album_privacy);
-#line 10873 "FacebookPublishing.c"
+#line 10601 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_create_album_message_parent_class = g_type_class_peek_parent (klass);
-#line 10880 "FacebookPublishing.c"
+#line 10608 "FacebookPublishing.c"
 }
 
 
@@ -10933,204 +10661,204 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
 
 
 static void publishing_facebook_value_graph_session_init (GValue* value) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 10903 "FacebookPublishing.c"
+#line 10631 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_session_free_value (GValue* value) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 10912 "FacebookPublishing.c"
+#line 10640 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_session_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_session_ref (src_value->data[0].v_pointer);
-#line 10922 "FacebookPublishing.c"
+#line 10650 "FacebookPublishing.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10926 "FacebookPublishing.c"
+#line 10654 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 10934 "FacebookPublishing.c"
+#line 10662 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 10941 "FacebookPublishing.c"
+#line 10669 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* object;
 		object = collect_values[0].v_pointer;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10948 "FacebookPublishing.c"
+#line 10676 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 10952 "FacebookPublishing.c"
+#line 10680 "FacebookPublishing.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 10956 "FacebookPublishing.c"
+#line 10684 "FacebookPublishing.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10960 "FacebookPublishing.c"
+#line 10688 "FacebookPublishing.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10964 "FacebookPublishing.c"
+#line 10692 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookGraphSession** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10975 "FacebookPublishing.c"
+#line 10703 "FacebookPublishing.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 10981 "FacebookPublishing.c"
+#line 10709 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10985 "FacebookPublishing.c"
+#line 10713 "FacebookPublishing.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 10989 "FacebookPublishing.c"
+#line 10717 "FacebookPublishing.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10993 "FacebookPublishing.c"
+#line 10721 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecGraphSession* spec;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 11007 "FacebookPublishing.c"
+#line 10735 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11016 "FacebookPublishing.c"
+#line 10744 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 11036 "FacebookPublishing.c"
+#line 10764 "FacebookPublishing.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11040 "FacebookPublishing.c"
+#line 10768 "FacebookPublishing.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 11046 "FacebookPublishing.c"
+#line 10774 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 11065 "FacebookPublishing.c"
+#line 10793 "FacebookPublishing.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11069 "FacebookPublishing.c"
+#line 10797 "FacebookPublishing.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 11075 "FacebookPublishing.c"
+#line 10803 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_parent_class = g_type_class_peek_parent (klass);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionClass *) klass)->finalize = publishing_facebook_graph_session_finalize;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 11089 "FacebookPublishing.c"
+#line 10817 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 11098 "FacebookPublishing.c"
+#line 10826 "FacebookPublishing.c"
 }
 
 
@@ -11138,23 +10866,23 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
 	PublishingFacebookGraphSession * self;
 	SoupSession* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp1_, NULL, FALSE);
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued, self);
-#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 11122 "FacebookPublishing.c"
+#line 10850 "FacebookPublishing.c"
 }
 
 
@@ -11175,24 +10903,24 @@ GType publishing_facebook_graph_session_get_type (void) {
 gpointer publishing_facebook_graph_session_ref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 11147 "FacebookPublishing.c"
+#line 10875 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_unref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11160 "FacebookPublishing.c"
+#line 10888 "FacebookPublishing.c"
 	}
 }
 
@@ -11200,35 +10928,35 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
 static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 11172 "FacebookPublishing.c"
+#line 10900 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 11178 "FacebookPublishing.c"
+#line 10906 "FacebookPublishing.c"
 	}
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 11182 "FacebookPublishing.c"
+#line 10910 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 11189 "FacebookPublishing.c"
+#line 10917 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 11196 "FacebookPublishing.c"
+#line 10924 "FacebookPublishing.c"
 }
 
 
@@ -11242,77 +10970,77 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
 	PublishingFacebookGraphSession* _tmp3_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp5_ = NULL;
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (publishing_params), NULL);
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookUploader*) g_type_create_instance (object_type);
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishables;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = publishables_length1;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = _tmp1_;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables_length1 = _tmp1__length1;
-#line 1625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = session;
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _publishing_facebook_graph_session_ref0 (_tmp2_);
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->session = _tmp3_;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_params;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _publishing_facebook_publishing_parameters_ref0 (_tmp4_);
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp5_;
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 11252 "FacebookPublishing.c"
+#line 10980 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_uploader_construct (PUBLISHING_FACEBOOK_TYPE_UPLOADER, session, publishing_params, publishables, publishables_length1);
-#line 11259 "FacebookPublishing.c"
+#line 10987 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self) {
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes);
-#line 11266 "FacebookPublishing.c"
+#line 10994 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 11273 "FacebookPublishing.c"
+#line 11001 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 11280 "FacebookPublishing.c"
+#line 11008 "FacebookPublishing.c"
 }
 
 
@@ -11350,167 +11078,167 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp32_ = NULL;
 	PublishingFacebookGraphSession* _tmp33_ = NULL;
 	PublishingFacebookGraphMessage* _tmp34_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_file;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable = _tmp3_;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishable;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file = _tmp5_;
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file;
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_ == NULL) {
-#line 11342 "FacebookPublishing.c"
+#line 11070 "FacebookPublishing.c"
 		gint _tmp7_ = 0;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->current_file;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->current_file = _tmp7_ + 1;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (file);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (publishable);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 11354 "FacebookPublishing.c"
+#line 11082 "FacebookPublishing.c"
 	}
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishable;
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 11362 "FacebookPublishing.c"
+#line 11090 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->publishing_params;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp11_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strdup_printf ("/%s/photos", _tmp13_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp14_;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 11381 "FacebookPublishing.c"
+#line 11109 "FacebookPublishing.c"
 	} else {
 		gchar* _tmp15_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = g_strdup ("/me/videos");
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp15_;
-#line 11390 "FacebookPublishing.c"
+#line 11118 "FacebookPublishing.c"
 	}
-#line 1640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = g_strdup (_tmp8_);
-#line 1640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_uri = _tmp16_;
-#line 1644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = publishable;
-#line 1644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
-#line 1644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 11402 "FacebookPublishing.c"
+#line 11130 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = self->priv->publishing_params;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp21_ = _tmp20_->privacy_object;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp21_;
-#line 11411 "FacebookPublishing.c"
+#line 11139 "FacebookPublishing.c"
 	} else {
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = NULL;
-#line 11415 "FacebookPublishing.c"
+#line 11143 "FacebookPublishing.c"
 	}
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = g_strdup (_tmp17_);
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_privacy = _tmp22_;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->session;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = resource_uri;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = publishable;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->publishing_params;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_->strip_metadata;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = resource_privacy;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = publishing_facebook_graph_session_new_upload (_tmp23_, _tmp24_, _tmp25_, _tmp27_, _tmp28_);
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	upload_message = _tmp29_;
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = upload_message;
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp30_, "data-transmitted", (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = upload_message;
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp31_, "completed", (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = upload_message;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp32_, "failed", (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = self->priv->session;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = upload_message;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp33_, _tmp34_);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (upload_message);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_privacy);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_uri);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (file);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (publishable);
-#line 11467 "FacebookPublishing.c"
+#line 11195 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self) {
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_send_current_file (self);
-#line 11478 "FacebookPublishing.c"
+#line 11206 "FacebookPublishing.c"
 }
 
 
@@ -11528,52 +11256,52 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 	gdouble _tmp6_ = 0.0;
 	SpitPublishingProgressCallback _tmp7_ = NULL;
 	void* _tmp7__target = NULL;
-#line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file_span = 1.0 / _tmp0__length1;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = bytes_written_so_far;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = total_bytes;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->current_file;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = file_span;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = this_file_fraction_complete;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file_span;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->status_updated;
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__target = self->priv->status_updated_target;
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 11526 "FacebookPublishing.c"
+#line 11254 "FacebookPublishing.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
 		gdouble _tmp10_ = 0.0;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->status_updated;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8__target = self->priv->status_updated_target;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = fraction_complete;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 11541 "FacebookPublishing.c"
+#line 11269 "FacebookPublishing.c"
 	}
 }
 
@@ -11589,50 +11317,50 @@ static void publishing_facebook_uploader_on_message_completed (PublishingFaceboo
 	gint _tmp7_ = 0;
 	SpitPublishingPublishable** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->current_file;
-#line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = _tmp6_ + 1;
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->current_file;
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishables;
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = self->priv->publishables_length1;
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ < _tmp8__length1) {
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_current_file (self);
-#line 11593 "FacebookPublishing.c"
+#line 11321 "FacebookPublishing.c"
 	} else {
 		gint _tmp9_ = 0;
-#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp9_);
-#line 11600 "FacebookPublishing.c"
+#line 11328 "FacebookPublishing.c"
 	}
 }
 
@@ -11645,33 +11373,33 @@ static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	GError* _tmp6_ = NULL;
-#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _error_;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "upload-error", _tmp6_);
-#line 11639 "FacebookPublishing.c"
+#line 11367 "FacebookPublishing.c"
 }
 
 
@@ -11680,248 +11408,248 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit
 	void* _tmp0__target = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 1692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = status_updated;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__target = status_updated_target;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = _tmp0_;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated_target = _tmp0__target;
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishables;
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->priv->publishables_length1;
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1__length1 > 0) {
-#line 1696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_files (self);
-#line 11666 "FacebookPublishing.c"
+#line 11394 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_init (GValue* value) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 11674 "FacebookPublishing.c"
+#line 11402 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_uploader_free_value (GValue* value) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 11683 "FacebookPublishing.c"
+#line 11411 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_uploader_ref (src_value->data[0].v_pointer);
-#line 11693 "FacebookPublishing.c"
+#line 11421 "FacebookPublishing.c"
 	} else {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11697 "FacebookPublishing.c"
+#line 11425 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11705 "FacebookPublishing.c"
+#line 11433 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 11712 "FacebookPublishing.c"
+#line 11440 "FacebookPublishing.c"
 		PublishingFacebookUploader* object;
 		object = collect_values[0].v_pointer;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11719 "FacebookPublishing.c"
+#line 11447 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 11723 "FacebookPublishing.c"
+#line 11451 "FacebookPublishing.c"
 		}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 11727 "FacebookPublishing.c"
+#line 11455 "FacebookPublishing.c"
 	} else {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11731 "FacebookPublishing.c"
+#line 11459 "FacebookPublishing.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11735 "FacebookPublishing.c"
+#line 11463 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookUploader** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11746 "FacebookPublishing.c"
+#line 11474 "FacebookPublishing.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 11752 "FacebookPublishing.c"
+#line 11480 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11756 "FacebookPublishing.c"
+#line 11484 "FacebookPublishing.c"
 	} else {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11760 "FacebookPublishing.c"
+#line 11488 "FacebookPublishing.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11764 "FacebookPublishing.c"
+#line 11492 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecUploader* spec;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 11778 "FacebookPublishing.c"
+#line 11506 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_uploader (const GValue* value) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11787 "FacebookPublishing.c"
+#line 11515 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11807 "FacebookPublishing.c"
+#line 11535 "FacebookPublishing.c"
 	} else {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11811 "FacebookPublishing.c"
+#line 11539 "FacebookPublishing.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11817 "FacebookPublishing.c"
+#line 11545 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 11836 "FacebookPublishing.c"
+#line 11564 "FacebookPublishing.c"
 	} else {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11840 "FacebookPublishing.c"
+#line 11568 "FacebookPublishing.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11846 "FacebookPublishing.c"
+#line 11574 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookUploaderClass *) klass)->finalize = publishing_facebook_uploader_finalize;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookUploaderPrivate));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("upload_complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("upload_error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 11862 "FacebookPublishing.c"
+#line 11590 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = NULL;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 11873 "FacebookPublishing.c"
+#line 11601 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj) {
 	PublishingFacebookUploader * self;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 11889 "FacebookPublishing.c"
+#line 11617 "FacebookPublishing.c"
 }
 
 
@@ -11942,24 +11670,24 @@ GType publishing_facebook_uploader_get_type (void) {
 gpointer publishing_facebook_uploader_ref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 11914 "FacebookPublishing.c"
+#line 11642 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_uploader_unref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11927 "FacebookPublishing.c"
+#line 11655 "FacebookPublishing.c"
 	}
 }
 
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 608e5c5..3fafe37 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -61,7 +61,7 @@ internal const string USER_VISIBLE_NAME = "Facebook";
 internal const string APPLICATION_ID = "1612018629063184";
 internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
 internal const string SERVICE_WELCOME_MESSAGE =
-    _("You are not currently logged into Facebook.\n\nIf you don't yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function.");
+    _("You are not currently logged into Facebook.\n\nIf you don’t yet have a Facebook account, you can create one during the login process. During login, Shotwell Connect may ask you for permission to upload photos and publish to your feed. These permissions are required for Shotwell Connect to function.");
 internal const string RESTART_ERROR_MESSAGE =
     _("You have already logged in and out of Facebook during this Shotwell session.\nTo continue publishing to Facebook, quit and restart Shotwell, then try publishing again.");
 internal const string USER_AGENT = "Java/1.6.0_16";
@@ -252,7 +252,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("ACTION: testing connection to Facebook endpoint.");
         host.set_service_locked(true);
         
-        host.install_static_message_pane(_("Testing connection to Facebook..."));
+        host.install_static_message_pane(_("Testing connection to Facebook…"));
         
         GraphMessage endpoint_test_message = graph_session.new_endpoint_test();
         endpoint_test_message.completed.connect(on_endpoint_test_completed);
@@ -345,7 +345,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("ACTION: creating a new album named \"%s\".\n", publishing_params.new_album_name);
         
         host.set_service_locked(true);
-        host.install_static_message_pane(_("Creating album..."));
+        host.install_static_message_pane(_("Creating album…"));
         
         GraphMessage create_album_message = graph_session.new_create_album(
             publishing_params.new_album_name, publishing_params.privacy_object);
@@ -371,7 +371,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to Facebook can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to Facebook can’t continue.")));
             return;
         }
         
@@ -811,30 +811,14 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
-    private WebKit.WebView webview = null;
-    private Gtk.Box pane_widget = null;
-    private Gtk.ScrolledWindow webview_frame = null;
+internal class WebAuthenticationPane : Shotwell.Plugins.Common.WebAuthenticationPane {
     private static bool cache_dirty = false;
 
     public signal void login_succeeded(string success_url);
     public signal void login_failed();
 
     public WebAuthenticationPane() {
-        pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
-        webview_frame = new Gtk.ScrolledWindow(null, null);
-        webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN);
-        webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-
-        webview = new WebKit.WebView();
-        webview.get_settings().enable_plugins = false;
-
-        webview.load_changed.connect(on_page_load_changed);
-        webview.context_menu.connect(() => { return true; });
-
-        webview_frame.add(webview);
-        pane_widget.pack_start(webview_frame, true, true, 0);
+        Object (login_uri : get_login_url ());
     }
 
     private class LocaleLookup {
@@ -858,7 +842,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
         
     }
     
-    private LocaleLookup[] locale_lookup_table = {
+    private static LocaleLookup[] locale_lookup_table = {
         new LocaleLookup( "es", "es-la", "ES", "es-es" ),
         new LocaleLookup( "en", "en-gb", "US", "en-us" ),
         new LocaleLookup( "fr", "fr-fr", "CA", "fr-ca" ),
@@ -906,7 +890,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
         new LocaleLookup( "ml", "ml-in" )
     };
     
-    private string get_system_locale_as_facebook_locale() {
+    private static string get_system_locale_as_facebook_locale() {
         unowned string? raw_system_locale = Intl.setlocale(LocaleCategory.ALL, "");
         if (raw_system_locale == null || raw_system_locale == "")
             return "www";
@@ -938,15 +922,14 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
         return "www";
     }
 
-    private string get_login_url() {
-        string facebook_locale = get_system_locale_as_facebook_locale();
+    private static string get_login_url() {
+        var facebook_locale = get_system_locale_as_facebook_locale();
+
         return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&display=popup&scope=publish_actions,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID);
     }
 
-    private void on_page_load() {
-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
-
-        string loaded_url = webview.uri.dup();
+    public override void on_page_load() {
+        string loaded_url = get_view ().uri.dup();
         debug("loaded url: " + loaded_url);
 
         // strip parameters from the loaded url
@@ -959,7 +942,7 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
         // were we redirected to the facebook login success page?
         if (loaded_url.contains("login_success")) {
             cache_dirty = true;
-            login_succeeded(webview.uri);
+            login_succeeded(get_view ().uri);
             return;
         }
 
@@ -970,42 +953,9 @@ internal class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
         }
     }
 
-    private void on_load_started() {
-        pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
-    }
-
-    private void on_page_load_changed (WebKit.LoadEvent load_event) {
-        switch (load_event) {
-            case WebKit.LoadEvent.STARTED:
-            case WebKit.LoadEvent.REDIRECTED:
-                on_load_started();
-                break;
-            case WebKit.LoadEvent.FINISHED:
-                on_page_load();
-                break;
-        }
-
-        return;
-    }
-
     public static bool is_cache_dirty() {
         return cache_dirty;
     }
-
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-
-    public void on_pane_installed() {
-        webview.load_uri(get_login_url());
-    }
-
-    public void on_pane_uninstalled() {
-    }
 }
 
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
@@ -1466,8 +1416,8 @@ internal class GraphSession {
     private GraphMessage? current_message;
     
     public GraphSession() {
-        this.soup_session = new Soup.SessionAsync();
-        this.soup_session.request_unqueued.connect(on_request_unqueued);
+        this.soup_session = new Soup.Session ();
+        this.soup_session.request_unqueued.connect (on_request_unqueued);
         this.soup_session.timeout = 15;
         this.access_token = null;
         this.current_message = null;
@@ -1475,7 +1425,7 @@ internal class GraphSession {
     }
 
     ~GraphSession() {
-         soup_session.request_unqueued.disconnect(on_request_unqueued);
+         soup_session.request_unqueued.disconnect (on_request_unqueued);
      }
     
     private void manage_message(GraphMessage msg) {
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index 3bada95..e6d9a5e 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -506,7 +506,7 @@ static void flickr_service_finalize (GObject* obj);
 #define PUBLISHING_FLICKR_SERVICE_NAME "Flickr"
 #define PUBLISHING_FLICKR_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Flickr.\n" \
 "\n" \
-"Click Login to log into Flickr in your Web browser.  You will have to " \
+"Click Log in to log into Flickr in your Web browser. You will have to " \
 "authorize Shotwell Connect to link to your Flickr account.")
 #define PUBLISHING_FLICKR_RESTART_ERROR_MESSAGE _ ("You have already logged in and out of Flickr during this Shotwell sess" \
 "ion.\n" \
@@ -2765,7 +2765,7 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _ ("Preparing for login...");
+	_tmp2_ = _ ("Preparing for login…");
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3237,7 +3237,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin
 		_tmp4_ = self->priv->host;
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n't continue.");
+"n’t continue.");
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -3316,7 +3316,7 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _ ("Verifying authorization...");
+	_tmp3_ = _ ("Verifying authorization…");
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -4163,7 +4163,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		_tmp5_ = self->priv->host;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n't continue.");
+"n’t continue.");
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8615,7 +8615,7 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _ ("500 x 375 pixels");
+	_tmp2_ = _ ("500 × 375 pixels");
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500);
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8625,7 +8625,7 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4__length1 = _result__length1;
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _ ("1024 x 768 pixels");
+	_tmp5_ = _ ("1024 × 768 pixels");
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024);
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8635,7 +8635,7 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = _ ("2048 x 1536 pixels");
+	_tmp8_ = _ ("2048 × 1536 pixels");
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048);
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -8645,7 +8645,7 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10__length1 = _result__length1;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _ ("4096 x 3072 pixels");
+	_tmp11_ = _ ("4096 × 3072 pixels");
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index 415e36a..c214ce9 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -57,7 +57,7 @@ namespace Publishing.Flickr {
 
 internal const string SERVICE_NAME = "Flickr";
 internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Flickr.\n\nClick Login to log into Flickr in your Web browser.  You will have to authorize Shotwell Connect to link to your Flickr account.");
+    _("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
 internal const string RESTART_ERROR_MESSAGE = 
     _("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to Flickr, quit and restart Shotwell, then try publishing again.");
 internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
@@ -371,7 +371,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("ACTION: running authentication request transaction");
 
         host.set_service_locked(true);
-        host.install_static_message_pane(_("Preparing for login..."));
+        host.install_static_message_pane(_("Preparing for login…"));
 
         AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session);
         txn.completed.connect(on_auth_request_txn_completed);
@@ -441,7 +441,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to Flickr can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to Flickr can’t continue.")));
             return;        
         }
         
@@ -454,7 +454,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("ACTION: validating authorization PIN %s", pin);
         
         host.set_service_locked(true);
-        host.install_static_message_pane(_("Verifying authorization..."));
+        host.install_static_message_pane(_("Verifying authorization…"));
         
         AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin);
         txn.completed.connect(on_access_token_fetch_txn_completed);
@@ -591,7 +591,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
             warning("Could not parse UI file! Error: %s.", e.message);
             host.post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to Flickr can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to Flickr can’t continue.")));
             return;
         }
 
@@ -1228,10 +1228,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private SizeEntry[] create_sizes() {
         SizeEntry[] result = new SizeEntry[0];
 
-        result += new SizeEntry(_("500 x 375 pixels"), 500);
-        result += new SizeEntry(_("1024 x 768 pixels"), 1024);
-        result += new SizeEntry(_("2048 x 1536 pixels"), 2048);
-        result += new SizeEntry(_("4096 x 3072 pixels"), 4096);
+        result += new SizeEntry(_("500 × 375 pixels"), 500);
+        result += new SizeEntry(_("1024 × 768 pixels"), 1024);
+        result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
+        result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
         result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
 
         return result;
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index abbd994..7e6e19a 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -364,9 +364,9 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
 static void picasa_service_finalize (GObject* obj);
 #define PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Picasa Web Albums.\n" \
 "\n" \
-"Click Login to log into Picasa Web Albums in your Web browser. You wil" \
-"l have to authorize Shotwell Connect to link to your Picasa Web Albums" \
-" account.")
+"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.")
 #define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance);
 void publishing_picasa_publishing_parameters_unref (gpointer instance);
@@ -2582,7 +2582,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \
-"n't continue.");
+"n’t continue.");
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2684,7 +2684,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _ ("Creating album...");
+	_tmp6_ = _ ("Creating album…");
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp5_, _tmp6_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5997,7 +5997,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = _ ("Small (640 x 480 pixels)");
+	_tmp2_ = _ ("Small (640 × 480 pixels)");
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp2_, 640);
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6007,7 +6007,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4__length1 = _result__length1;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = _ ("Medium (1024 x 768 pixels)");
+	_tmp5_ = _ ("Medium (1024 × 768 pixels)");
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp5_, 1024);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6017,7 +6017,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7__length1 = _result__length1;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = _ ("Recommended (1600 x 1200 pixels)");
+	_tmp8_ = _ ("Recommended (1600 × 1200 pixels)");
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp8_, 1600);
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6027,7 +6027,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10__length1 = _result__length1;
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = _ ("Google+ (2048 x 1536 pixels)");
+	_tmp11_ = _ ("Google+ (2048 × 1536 pixels)");
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp11_, 2048);
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index a393c08..621ae12 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -56,7 +56,7 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
 namespace Publishing.Picasa {
 
 internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Picasa Web Albums.\n\nClick Login to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account.");
+    _("You are not currently logged into Picasa Web Albums.\n\nClick Log in to log into Picasa Web Albums in your Web browser. You will have to authorize Shotwell Connect to link to your Picasa Web Albums account.");
 internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
 
 public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
@@ -358,7 +358,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             warning("Could not parse UI file! Error: %s.", e.message);
             get_host().post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to Picasa can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to Picasa can’t continue.")));
             return;
         }
 
@@ -376,7 +376,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         debug("ACTION: creating new album '%s' on remote server.",
             publishing_parameters.get_target_album_name());
 
-        get_host().install_static_message_pane(_("Creating album..."));
+        get_host().install_static_message_pane(_("Creating album…"));
 
         get_host().set_service_locked(true);
 
@@ -743,10 +743,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private SizeDescription[] create_size_descriptions() {
         SizeDescription[] result = new SizeDescription[0];
 
-        result += new SizeDescription(_("Small (640 x 480 pixels)"), 640);
-        result += new SizeDescription(_("Medium (1024 x 768 pixels)"), 1024);
-        result += new SizeDescription(_("Recommended (1600 x 1200 pixels)"), 1600);
-        result += new SizeDescription(_("Google+ (2048 x 1536 pixels)"), 2048);
+        result += new SizeDescription(_("Small (640 × 480 pixels)"), 640);
+        result += new SizeDescription(_("Medium (1024 × 768 pixels)"), 1024);
+        result += new SizeDescription(_("Recommended (1600 × 1200 pixels)"), 1600);
+        result += new SizeDescription(_("Google+ (2048 × 1536 pixels)"), 2048);
         result += new SizeDescription(_("Original Size"), PublishingParameters.ORIGINAL_SIZE);
 
         return result;
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index f8c3b68..f83e707 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -17,10 +17,12 @@
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#include <libsoup/soup.h>
 #include <libxml/tree.h>
 #include <float.h>
 #include <math.h>
-#include <libsoup/soup.h>
+#include <gcr/gcr-base.h>
+#include <ui/gcr-ui.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -142,6 +144,17 @@ typedef struct _PublishingPiwigoTransactionClass PublishingPiwigoTransactionClas
 
 typedef struct _PublishingPiwigoSessionLoginTransaction PublishingPiwigoSessionLoginTransaction;
 typedef struct _PublishingPiwigoSessionLoginTransactionClass PublishingPiwigoSessionLoginTransactionClass;
+
+#define PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE (publishing_piwigo_ssl_error_pane_get_type ())
+#define PUBLISHING_PIWIGO_SSL_ERROR_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane))
+#define PUBLISHING_PIWIGO_SSL_ERROR_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPaneClass))
+#define PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE))
+#define PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE))
+#define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPaneClass))
+
+typedef struct _PublishingPiwigoSSLErrorPane PublishingPiwigoSSLErrorPane;
+typedef struct _PublishingPiwigoSSLErrorPaneClass PublishingPiwigoSSLErrorPaneClass;
+#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
@@ -220,11 +233,15 @@ typedef struct _PublishingPiwigoUploaderPrivate PublishingPiwigoUploaderPrivate;
 
 typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTransaction;
 typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
+typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
+typedef struct _Block1Data Block1Data;
+#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
 typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
 typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
 typedef struct _PublishingPiwigoSessionPrivate PublishingPiwigoSessionPrivate;
 typedef struct _PublishingPiwigoTransactionPrivate PublishingPiwigoTransactionPrivate;
 typedef struct _PublishingPiwigoSessionLoginTransactionPrivate PublishingPiwigoSessionLoginTransactionPrivate;
+#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
 typedef struct _PublishingPiwigoSessionGetStatusTransactionPrivate PublishingPiwigoSessionGetStatusTransactionPrivate;
 typedef struct _PublishingPiwigoCategoriesGetListTransactionPrivate PublishingPiwigoCategoriesGetListTransactionPrivate;
 typedef struct _PublishingPiwigoSessionLogoutTransactionPrivate PublishingPiwigoSessionLogoutTransactionPrivate;
@@ -362,6 +379,26 @@ struct _PublishingPiwigoUploaderPrivate {
 	PublishingPiwigoPublishingParameters* parameters;
 };
 
+struct _PublishingPiwigoSSLErrorPane {
+	GObject parent_instance;
+	PublishingPiwigoSSLErrorPanePrivate * priv;
+};
+
+struct _PublishingPiwigoSSLErrorPaneClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingPiwigoSSLErrorPanePrivate {
+	GtkBuilder* builder;
+	GtkWidget* content;
+};
+
+struct _Block1Data {
+	int _ref_count_;
+	PublishingPiwigoSSLErrorPane* self;
+	GTlsCertificate* cert;
+};
+
 struct _PublishingPiwigoAuthenticationPane {
 	GObject parent_instance;
 	PublishingPiwigoAuthenticationPanePrivate * priv;
@@ -522,6 +559,8 @@ static gpointer publishing_piwigo_publishing_parameters_parent_class = NULL;
 static gpointer publishing_piwigo_piwigo_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_piwigo_uploader_parent_class = NULL;
+static gpointer publishing_piwigo_ssl_error_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface* publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_piwigo_authentication_pane_parent_class = NULL;
 static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE;
 static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE = NULL;
@@ -665,6 +704,14 @@ static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_cli
 GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingPiwigoAuthenticationPane* self);
 GType publishing_piwigo_transaction_get_type (void) G_GNUC_CONST;
 GType publishing_piwigo_session_login_transaction_get_type (void) G_GNUC_CONST;
+static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url);
+GType publishing_piwigo_ssl_error_pane_get_type (void) G_GNUC_CONST;
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
+static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self);
+static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
+GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self);
+static void _vala_SoupURI_free (SoupURI* self);
 gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url);
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
@@ -753,6 +800,21 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_n
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+#define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
+enum  {
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY
+};
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static void ___lambda4_ (Block1Data* _data1_);
+static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self);
+static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base);
+static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj);
 #define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
 enum  {
 	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY
@@ -833,6 +895,8 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat
 enum  {
 	PUBLISHING_PIWIGO_SESSION_LOGIN_TRANSACTION_DUMMY_PROPERTY
 };
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
 enum  {
 	PUBLISHING_PIWIGO_SESSION_GET_STATUS_TRANSACTION_DUMMY_PROPERTY
 };
@@ -870,7 +934,7 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 874 "PiwigoPublishing.c"
+#line 938 "PiwigoPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -883,18 +947,18 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 		piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 887 "PiwigoPublishing.c"
+#line 951 "PiwigoPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 891 "PiwigoPublishing.c"
+#line 955 "PiwigoPublishing.c"
 }
 
 
 PiwigoService* piwigo_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 898 "PiwigoPublishing.c"
+#line 962 "PiwigoPublishing.c"
 }
 
 
@@ -916,7 +980,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 920 "PiwigoPublishing.c"
+#line 984 "PiwigoPublishing.c"
 }
 
 
@@ -929,7 +993,7 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.piwigo";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 933 "PiwigoPublishing.c"
+#line 997 "PiwigoPublishing.c"
 }
 
 
@@ -942,14 +1006,14 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Piwigo";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 946 "PiwigoPublishing.c"
+#line 1010 "PiwigoPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 953 "PiwigoPublishing.c"
+#line 1017 "PiwigoPublishing.c"
 }
 
 
@@ -960,17 +1024,17 @@ static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 964 "PiwigoPublishing.c"
+#line 1028 "PiwigoPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 970 "PiwigoPublishing.c"
+#line 1034 "PiwigoPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 974 "PiwigoPublishing.c"
+#line 1038 "PiwigoPublishing.c"
 }
 
 
@@ -1052,7 +1116,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 1056 "PiwigoPublishing.c"
+#line 1120 "PiwigoPublishing.c"
 }
 
 
@@ -1060,7 +1124,7 @@ static void piwigo_service_real_activation (SpitPluggable* base, gboolean enable
 	PiwigoService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1064 "PiwigoPublishing.c"
+#line 1128 "PiwigoPublishing.c"
 }
 
 
@@ -1081,7 +1145,7 @@ static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1085 "PiwigoPublishing.c"
+#line 1149 "PiwigoPublishing.c"
 }
 
 
@@ -1094,7 +1158,7 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1098 "PiwigoPublishing.c"
+#line 1162 "PiwigoPublishing.c"
 }
 
 
@@ -1103,7 +1167,7 @@ static void piwigo_service_class_init (PiwigoServiceClass * klass) {
 	piwigo_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1107 "PiwigoPublishing.c"
+#line 1171 "PiwigoPublishing.c"
 }
 
 
@@ -1120,7 +1184,7 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) piwigo_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) piwigo_service_real_activation;
-#line 1124 "PiwigoPublishing.c"
+#line 1188 "PiwigoPublishing.c"
 }
 
 
@@ -1131,7 +1195,7 @@ static void piwigo_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) piwigo_service_real_get_supported_media;
-#line 1135 "PiwigoPublishing.c"
+#line 1199 "PiwigoPublishing.c"
 }
 
 
@@ -1145,7 +1209,7 @@ static void piwigo_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1149 "PiwigoPublishing.c"
+#line 1213 "PiwigoPublishing.c"
 }
 
 
@@ -1210,14 +1274,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
 	self->comment = _tmp6_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1214 "PiwigoPublishing.c"
+#line 1278 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1221 "PiwigoPublishing.c"
+#line 1285 "PiwigoPublishing.c"
 }
 
 
@@ -1261,14 +1325,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
 	self->comment = _tmp5_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1265 "PiwigoPublishing.c"
+#line 1329 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1272 "PiwigoPublishing.c"
+#line 1336 "PiwigoPublishing.c"
 }
 
 
@@ -1283,14 +1347,14 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
 	result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1287 "PiwigoPublishing.c"
+#line 1351 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_category_init (GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1294 "PiwigoPublishing.c"
+#line 1358 "PiwigoPublishing.c"
 }
 
 
@@ -1299,7 +1363,7 @@ static void publishing_piwigo_value_category_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1303 "PiwigoPublishing.c"
+#line 1367 "PiwigoPublishing.c"
 	}
 }
 
@@ -1309,11 +1373,11 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1313 "PiwigoPublishing.c"
+#line 1377 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1317 "PiwigoPublishing.c"
+#line 1381 "PiwigoPublishing.c"
 	}
 }
 
@@ -1321,37 +1385,37 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1325 "PiwigoPublishing.c"
+#line 1389 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1332 "PiwigoPublishing.c"
+#line 1396 "PiwigoPublishing.c"
 		PublishingPiwigoCategory* object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1339 "PiwigoPublishing.c"
+#line 1403 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1343 "PiwigoPublishing.c"
+#line 1407 "PiwigoPublishing.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1347 "PiwigoPublishing.c"
+#line 1411 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1351 "PiwigoPublishing.c"
+#line 1415 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1355 "PiwigoPublishing.c"
+#line 1419 "PiwigoPublishing.c"
 }
 
 
@@ -1362,25 +1426,25 @@ static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1366 "PiwigoPublishing.c"
+#line 1430 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1372 "PiwigoPublishing.c"
+#line 1436 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1376 "PiwigoPublishing.c"
+#line 1440 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1380 "PiwigoPublishing.c"
+#line 1444 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1384 "PiwigoPublishing.c"
+#line 1448 "PiwigoPublishing.c"
 }
 
 
@@ -1394,7 +1458,7 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1398 "PiwigoPublishing.c"
+#line 1462 "PiwigoPublishing.c"
 }
 
 
@@ -1403,7 +1467,7 @@ gpointer publishing_piwigo_value_get_category (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1407 "PiwigoPublishing.c"
+#line 1471 "PiwigoPublishing.c"
 }
 
 
@@ -1423,17 +1487,17 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1427 "PiwigoPublishing.c"
+#line 1491 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1431 "PiwigoPublishing.c"
+#line 1495 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1437 "PiwigoPublishing.c"
+#line 1501 "PiwigoPublishing.c"
 	}
 }
 
@@ -1452,17 +1516,17 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1456 "PiwigoPublishing.c"
+#line 1520 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1460 "PiwigoPublishing.c"
+#line 1524 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1466 "PiwigoPublishing.c"
+#line 1530 "PiwigoPublishing.c"
 	}
 }
 
@@ -1472,14 +1536,14 @@ static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass
 	publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1476 "PiwigoPublishing.c"
+#line 1540 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1483 "PiwigoPublishing.c"
+#line 1547 "PiwigoPublishing.c"
 }
 
 
@@ -1497,7 +1561,7 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj)
 	_g_free0 (self->display_name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
-#line 1501 "PiwigoPublishing.c"
+#line 1565 "PiwigoPublishing.c"
 }
 
 
@@ -1522,7 +1586,7 @@ gpointer publishing_piwigo_category_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1526 "PiwigoPublishing.c"
+#line 1590 "PiwigoPublishing.c"
 }
 
 
@@ -1535,7 +1599,7 @@ void publishing_piwigo_category_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1539 "PiwigoPublishing.c"
+#line 1603 "PiwigoPublishing.c"
 	}
 }
 
@@ -1563,21 +1627,21 @@ PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (G
 	self->name = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1567 "PiwigoPublishing.c"
+#line 1631 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1574 "PiwigoPublishing.c"
+#line 1638 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_permission_level_init (GValue* value) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1581 "PiwigoPublishing.c"
+#line 1645 "PiwigoPublishing.c"
 }
 
 
@@ -1586,7 +1650,7 @@ static void publishing_piwigo_value_permission_level_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1590 "PiwigoPublishing.c"
+#line 1654 "PiwigoPublishing.c"
 	}
 }
 
@@ -1596,11 +1660,11 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s
 	if (src_value->data[0].v_pointer) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1600 "PiwigoPublishing.c"
+#line 1664 "PiwigoPublishing.c"
 	} else {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1604 "PiwigoPublishing.c"
+#line 1668 "PiwigoPublishing.c"
 	}
 }
 
@@ -1608,37 +1672,37 @@ static void publishing_piwigo_value_permission_level_copy_value (const GValue* s
 static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1612 "PiwigoPublishing.c"
+#line 1676 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1619 "PiwigoPublishing.c"
+#line 1683 "PiwigoPublishing.c"
 		PublishingPiwigoPermissionLevel* object;
 		object = collect_values[0].v_pointer;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1626 "PiwigoPublishing.c"
+#line 1690 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1630 "PiwigoPublishing.c"
+#line 1694 "PiwigoPublishing.c"
 		}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1634 "PiwigoPublishing.c"
+#line 1698 "PiwigoPublishing.c"
 	} else {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1638 "PiwigoPublishing.c"
+#line 1702 "PiwigoPublishing.c"
 	}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1642 "PiwigoPublishing.c"
+#line 1706 "PiwigoPublishing.c"
 }
 
 
@@ -1649,25 +1713,25 @@ static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue
 	if (!object_p) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1653 "PiwigoPublishing.c"
+#line 1717 "PiwigoPublishing.c"
 	}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1659 "PiwigoPublishing.c"
+#line 1723 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1663 "PiwigoPublishing.c"
+#line 1727 "PiwigoPublishing.c"
 	} else {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1667 "PiwigoPublishing.c"
+#line 1731 "PiwigoPublishing.c"
 	}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1671 "PiwigoPublishing.c"
+#line 1735 "PiwigoPublishing.c"
 }
 
 
@@ -1681,7 +1745,7 @@ GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1685 "PiwigoPublishing.c"
+#line 1749 "PiwigoPublishing.c"
 }
 
 
@@ -1690,7 +1754,7 @@ gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1694 "PiwigoPublishing.c"
+#line 1758 "PiwigoPublishing.c"
 }
 
 
@@ -1710,17 +1774,17 @@ void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_obj
 		value->data[0].v_pointer = v_object;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1714 "PiwigoPublishing.c"
+#line 1778 "PiwigoPublishing.c"
 	} else {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1718 "PiwigoPublishing.c"
+#line 1782 "PiwigoPublishing.c"
 	}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1724 "PiwigoPublishing.c"
+#line 1788 "PiwigoPublishing.c"
 	}
 }
 
@@ -1739,17 +1803,17 @@ void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_ob
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1743 "PiwigoPublishing.c"
+#line 1807 "PiwigoPublishing.c"
 	} else {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1747 "PiwigoPublishing.c"
+#line 1811 "PiwigoPublishing.c"
 	}
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1753 "PiwigoPublishing.c"
+#line 1817 "PiwigoPublishing.c"
 	}
 }
 
@@ -1759,14 +1823,14 @@ static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermi
 	publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1763 "PiwigoPublishing.c"
+#line 1827 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1770 "PiwigoPublishing.c"
+#line 1834 "PiwigoPublishing.c"
 }
 
 
@@ -1778,7 +1842,7 @@ static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermiss
 	g_signal_handlers_destroy (self);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 1782 "PiwigoPublishing.c"
+#line 1846 "PiwigoPublishing.c"
 }
 
 
@@ -1803,7 +1867,7 @@ gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1807 "PiwigoPublishing.c"
+#line 1871 "PiwigoPublishing.c"
 }
 
 
@@ -1816,7 +1880,7 @@ void publishing_piwigo_permission_level_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1820 "PiwigoPublishing.c"
+#line 1884 "PiwigoPublishing.c"
 	}
 }
 
@@ -1844,21 +1908,21 @@ PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_
 	self->name = _tmp2_;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1848 "PiwigoPublishing.c"
+#line 1912 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1855 "PiwigoPublishing.c"
+#line 1919 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_size_entry_init (GValue* value) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1862 "PiwigoPublishing.c"
+#line 1926 "PiwigoPublishing.c"
 }
 
 
@@ -1867,7 +1931,7 @@ static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1871 "PiwigoPublishing.c"
+#line 1935 "PiwigoPublishing.c"
 	}
 }
 
@@ -1877,11 +1941,11 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 1881 "PiwigoPublishing.c"
+#line 1945 "PiwigoPublishing.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1885 "PiwigoPublishing.c"
+#line 1949 "PiwigoPublishing.c"
 	}
 }
 
@@ -1889,37 +1953,37 @@ static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_val
 static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1893 "PiwigoPublishing.c"
+#line 1957 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1900 "PiwigoPublishing.c"
+#line 1964 "PiwigoPublishing.c"
 		PublishingPiwigoSizeEntry* object;
 		object = collect_values[0].v_pointer;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1907 "PiwigoPublishing.c"
+#line 1971 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1911 "PiwigoPublishing.c"
+#line 1975 "PiwigoPublishing.c"
 		}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 1915 "PiwigoPublishing.c"
+#line 1979 "PiwigoPublishing.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1919 "PiwigoPublishing.c"
+#line 1983 "PiwigoPublishing.c"
 	}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1923 "PiwigoPublishing.c"
+#line 1987 "PiwigoPublishing.c"
 }
 
 
@@ -1930,25 +1994,25 @@ static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* valu
 	if (!object_p) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1934 "PiwigoPublishing.c"
+#line 1998 "PiwigoPublishing.c"
 	}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1940 "PiwigoPublishing.c"
+#line 2004 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1944 "PiwigoPublishing.c"
+#line 2008 "PiwigoPublishing.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 1948 "PiwigoPublishing.c"
+#line 2012 "PiwigoPublishing.c"
 	}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1952 "PiwigoPublishing.c"
+#line 2016 "PiwigoPublishing.c"
 }
 
 
@@ -1962,7 +2026,7 @@ GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1966 "PiwigoPublishing.c"
+#line 2030 "PiwigoPublishing.c"
 }
 
 
@@ -1971,7 +2035,7 @@ gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1975 "PiwigoPublishing.c"
+#line 2039 "PiwigoPublishing.c"
 }
 
 
@@ -1991,17 +2055,17 @@ void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 1995 "PiwigoPublishing.c"
+#line 2059 "PiwigoPublishing.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1999 "PiwigoPublishing.c"
+#line 2063 "PiwigoPublishing.c"
 	}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2005 "PiwigoPublishing.c"
+#line 2069 "PiwigoPublishing.c"
 	}
 }
 
@@ -2020,17 +2084,17 @@ void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2024 "PiwigoPublishing.c"
+#line 2088 "PiwigoPublishing.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2028 "PiwigoPublishing.c"
+#line 2092 "PiwigoPublishing.c"
 	}
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2034 "PiwigoPublishing.c"
+#line 2098 "PiwigoPublishing.c"
 	}
 }
 
@@ -2040,14 +2104,14 @@ static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryCl
 	publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2044 "PiwigoPublishing.c"
+#line 2108 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2051 "PiwigoPublishing.c"
+#line 2115 "PiwigoPublishing.c"
 }
 
 
@@ -2059,7 +2123,7 @@ static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* ob
 	g_signal_handlers_destroy (self);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 2063 "PiwigoPublishing.c"
+#line 2127 "PiwigoPublishing.c"
 }
 
 
@@ -2084,7 +2148,7 @@ gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2088 "PiwigoPublishing.c"
+#line 2152 "PiwigoPublishing.c"
 }
 
 
@@ -2097,7 +2161,7 @@ void publishing_piwigo_size_entry_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2101 "PiwigoPublishing.c"
+#line 2165 "PiwigoPublishing.c"
 	}
 }
 
@@ -2108,21 +2172,21 @@ PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_co
 	self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2112 "PiwigoPublishing.c"
+#line 2176 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2119 "PiwigoPublishing.c"
+#line 2183 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2126 "PiwigoPublishing.c"
+#line 2190 "PiwigoPublishing.c"
 }
 
 
@@ -2131,7 +2195,7 @@ static void publishing_piwigo_value_publishing_parameters_free_value (GValue* va
 	if (value->data[0].v_pointer) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2135 "PiwigoPublishing.c"
+#line 2199 "PiwigoPublishing.c"
 	}
 }
 
@@ -2141,11 +2205,11 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal
 	if (src_value->data[0].v_pointer) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2145 "PiwigoPublishing.c"
+#line 2209 "PiwigoPublishing.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2149 "PiwigoPublishing.c"
+#line 2213 "PiwigoPublishing.c"
 	}
 }
 
@@ -2153,37 +2217,37 @@ static void publishing_piwigo_value_publishing_parameters_copy_value (const GVal
 static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2157 "PiwigoPublishing.c"
+#line 2221 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2164 "PiwigoPublishing.c"
+#line 2228 "PiwigoPublishing.c"
 		PublishingPiwigoPublishingParameters* object;
 		object = collect_values[0].v_pointer;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2171 "PiwigoPublishing.c"
+#line 2235 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 2175 "PiwigoPublishing.c"
+#line 2239 "PiwigoPublishing.c"
 		}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2179 "PiwigoPublishing.c"
+#line 2243 "PiwigoPublishing.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2183 "PiwigoPublishing.c"
+#line 2247 "PiwigoPublishing.c"
 	}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2187 "PiwigoPublishing.c"
+#line 2251 "PiwigoPublishing.c"
 }
 
 
@@ -2194,25 +2258,25 @@ static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const G
 	if (!object_p) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2198 "PiwigoPublishing.c"
+#line 2262 "PiwigoPublishing.c"
 	}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2204 "PiwigoPublishing.c"
+#line 2268 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2208 "PiwigoPublishing.c"
+#line 2272 "PiwigoPublishing.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2212 "PiwigoPublishing.c"
+#line 2276 "PiwigoPublishing.c"
 	}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2216 "PiwigoPublishing.c"
+#line 2280 "PiwigoPublishing.c"
 }
 
 
@@ -2226,7 +2290,7 @@ GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2230 "PiwigoPublishing.c"
+#line 2294 "PiwigoPublishing.c"
 }
 
 
@@ -2235,7 +2299,7 @@ gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2239 "PiwigoPublishing.c"
+#line 2303 "PiwigoPublishing.c"
 }
 
 
@@ -2255,17 +2319,17 @@ void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2259 "PiwigoPublishing.c"
+#line 2323 "PiwigoPublishing.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2263 "PiwigoPublishing.c"
+#line 2327 "PiwigoPublishing.c"
 	}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2269 "PiwigoPublishing.c"
+#line 2333 "PiwigoPublishing.c"
 	}
 }
 
@@ -2284,17 +2348,17 @@ void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2288 "PiwigoPublishing.c"
+#line 2352 "PiwigoPublishing.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2292 "PiwigoPublishing.c"
+#line 2356 "PiwigoPublishing.c"
 	}
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2298 "PiwigoPublishing.c"
+#line 2362 "PiwigoPublishing.c"
 	}
 }
 
@@ -2304,7 +2368,7 @@ static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigo
 	publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2308 "PiwigoPublishing.c"
+#line 2372 "PiwigoPublishing.c"
 }
 
 
@@ -2321,7 +2385,7 @@ static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiw
 	self->no_upload_tags = FALSE;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2325 "PiwigoPublishing.c"
+#line 2389 "PiwigoPublishing.c"
 }
 
 
@@ -2337,7 +2401,7 @@ static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPu
 	_publishing_piwigo_permission_level_unref0 (self->perm_level);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2341 "PiwigoPublishing.c"
+#line 2405 "PiwigoPublishing.c"
 }
 
 
@@ -2362,7 +2426,7 @@ gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2366 "PiwigoPublishing.c"
+#line 2430 "PiwigoPublishing.c"
 }
 
 
@@ -2375,7 +2439,7 @@ void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2379 "PiwigoPublishing.c"
+#line 2443 "PiwigoPublishing.c"
 	}
 }
 
@@ -2419,14 +2483,14 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
 	self->priv->session = _tmp4_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2423 "PiwigoPublishing.c"
+#line 2487 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2430 "PiwigoPublishing.c"
+#line 2494 "PiwigoPublishing.c"
 }
 
 
@@ -2445,7 +2509,7 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
 	result = _tmp1_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2449 "PiwigoPublishing.c"
+#line 2513 "PiwigoPublishing.c"
 }
 
 
@@ -2463,7 +2527,7 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
 	result = _tmp1_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2467 "PiwigoPublishing.c"
+#line 2531 "PiwigoPublishing.c"
 }
 
 
@@ -2479,7 +2543,7 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2483 "PiwigoPublishing.c"
+#line 2547 "PiwigoPublishing.c"
 }
 
 
@@ -2496,7 +2560,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 2500 "PiwigoPublishing.c"
+#line 2564 "PiwigoPublishing.c"
 	}
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:157: PiwigoPublisher: starting interaction.");
@@ -2512,7 +2576,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		g_debug ("PiwigoPublishing.vala:162: PiwigoPublisher: session is authenticated.");
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2516 "PiwigoPublishing.c"
+#line 2580 "PiwigoPublishing.c"
 	} else {
 		gchar* persistent_url = NULL;
 		gchar* _tmp3_ = NULL;
@@ -2542,35 +2606,35 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		_tmp8_ = persistent_url;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp8_ != NULL) {
-#line 2545 "PiwigoPublishing.c"
+#line 2609 "PiwigoPublishing.c"
 			const gchar* _tmp9_ = NULL;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = persistent_username;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _tmp9_ != NULL;
-#line 2551 "PiwigoPublishing.c"
+#line 2615 "PiwigoPublishing.c"
 		} else {
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = FALSE;
-#line 2555 "PiwigoPublishing.c"
+#line 2619 "PiwigoPublishing.c"
 		}
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp7_) {
-#line 2559 "PiwigoPublishing.c"
+#line 2623 "PiwigoPublishing.c"
 			const gchar* _tmp10_ = NULL;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = persistent_password;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = _tmp10_ != NULL;
-#line 2565 "PiwigoPublishing.c"
+#line 2629 "PiwigoPublishing.c"
 		} else {
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = FALSE;
-#line 2569 "PiwigoPublishing.c"
+#line 2633 "PiwigoPublishing.c"
 		}
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp6_) {
-#line 2573 "PiwigoPublishing.c"
+#line 2637 "PiwigoPublishing.c"
 			const gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
@@ -2585,11 +2649,11 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 			_tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2588 "PiwigoPublishing.c"
+#line 2652 "PiwigoPublishing.c"
 		} else {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2592 "PiwigoPublishing.c"
+#line 2656 "PiwigoPublishing.c"
 		}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_password);
@@ -2597,7 +2661,7 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		_g_free0 (persistent_username);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_url);
-#line 2600 "PiwigoPublishing.c"
+#line 2664 "PiwigoPublishing.c"
 	}
 }
 
@@ -2608,7 +2672,7 @@ static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublishe
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = FALSE;
-#line 2611 "PiwigoPublishing.c"
+#line 2675 "PiwigoPublishing.c"
 }
 
 
@@ -2626,7 +2690,7 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
 	result = _tmp1_;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2629 "PiwigoPublishing.c"
+#line 2693 "PiwigoPublishing.c"
 }
 
 
@@ -2643,7 +2707,7 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiw
 	_tmp1_ = url;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2646 "PiwigoPublishing.c"
+#line 2710 "PiwigoPublishing.c"
 }
 
 
@@ -2661,7 +2725,7 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
 	result = _tmp1_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2664 "PiwigoPublishing.c"
+#line 2728 "PiwigoPublishing.c"
 }
 
 
@@ -2678,7 +2742,7 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_username (Publishi
 	_tmp1_ = username;
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2681 "PiwigoPublishing.c"
+#line 2745 "PiwigoPublishing.c"
 }
 
 
@@ -2696,7 +2760,7 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
 	result = _tmp1_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2699 "PiwigoPublishing.c"
+#line 2763 "PiwigoPublishing.c"
 }
 
 
@@ -2711,7 +2775,7 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_password (Publishi
 	_tmp1_ = password;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2714 "PiwigoPublishing.c"
+#line 2778 "PiwigoPublishing.c"
 }
 
 
@@ -2729,7 +2793,7 @@ gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiw
 	result = _tmp1_;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2732 "PiwigoPublishing.c"
+#line 2796 "PiwigoPublishing.c"
 }
 
 
@@ -2744,7 +2808,7 @@ static void publishing_piwigo_piwigo_publisher_set_remember_password (Publishing
 	_tmp1_ = remember_password;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2747 "PiwigoPublishing.c"
+#line 2811 "PiwigoPublishing.c"
 }
 
 
@@ -2762,7 +2826,7 @@ gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwig
 	result = _tmp1_;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2765 "PiwigoPublishing.c"
+#line 2829 "PiwigoPublishing.c"
 }
 
 
@@ -2777,7 +2841,7 @@ static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwi
 	_tmp1_ = last_category;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2780 "PiwigoPublishing.c"
+#line 2844 "PiwigoPublishing.c"
 }
 
 
@@ -2795,7 +2859,7 @@ gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiw
 	result = _tmp1_;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2798 "PiwigoPublishing.c"
+#line 2862 "PiwigoPublishing.c"
 }
 
 
@@ -2810,7 +2874,7 @@ static void publishing_piwigo_piwigo_publisher_set_last_permission_level (Publis
 	_tmp1_ = last_permission_level;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2813 "PiwigoPublishing.c"
+#line 2877 "PiwigoPublishing.c"
 }
 
 
@@ -2828,7 +2892,7 @@ gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiw
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2831 "PiwigoPublishing.c"
+#line 2895 "PiwigoPublishing.c"
 }
 
 
@@ -2843,7 +2907,7 @@ static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPi
 	_tmp1_ = last_photo_size;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2846 "PiwigoPublishing.c"
+#line 2910 "PiwigoPublishing.c"
 }
 
 
@@ -2861,7 +2925,7 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (Pu
 	result = _tmp1_;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2864 "PiwigoPublishing.c"
+#line 2928 "PiwigoPublishing.c"
 }
 
 
@@ -2876,7 +2940,7 @@ static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (Publis
 	_tmp1_ = title_as_comment;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 2879 "PiwigoPublishing.c"
+#line 2943 "PiwigoPublishing.c"
 }
 
 
@@ -2894,7 +2958,7 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (Publ
 	result = _tmp1_;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2897 "PiwigoPublishing.c"
+#line 2961 "PiwigoPublishing.c"
 }
 
 
@@ -2909,7 +2973,7 @@ static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (Publishi
 	_tmp1_ = no_upload_tags;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 2912 "PiwigoPublishing.c"
+#line 2976 "PiwigoPublishing.c"
 }
 
 
@@ -2927,7 +2991,7 @@ static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (
 	result = _tmp1_;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2930 "PiwigoPublishing.c"
+#line 2994 "PiwigoPublishing.c"
 }
 
 
@@ -2942,7 +3006,7 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
 	_tmp1_ = strip_metadata;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 2945 "PiwigoPublishing.c"
+#line 3009 "PiwigoPublishing.c"
 }
 
 
@@ -2960,7 +3024,7 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
 static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 2963 "PiwigoPublishing.c"
+#line 3027 "PiwigoPublishing.c"
 }
 
 
@@ -3005,7 +3069,182 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 	_g_object_unref0 (_tmp6_);
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 3008 "PiwigoPublishing.c"
+#line 3072 "PiwigoPublishing.c"
+}
+
+
+static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
+	PublishingPiwigoSession* _tmp0_ = NULL;
+	PublishingPiwigoSession* _tmp1_ = NULL;
+	gchar* persistent_url = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* persistent_username = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* persistent_password = NULL;
+	gchar* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp7_ = NULL;
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:293: SSL: User wants us to retry with broken cer" \
+"tificate");
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = publishing_piwigo_session_new ();
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->session = _tmp0_;
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = self->priv->session;
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_rest_support_session_set_insecure (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_url = _tmp2_;
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_username = _tmp3_;
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_password = _tmp4_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = persistent_url;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp7_ != NULL) {
+#line 3116 "PiwigoPublishing.c"
+		const gchar* _tmp8_ = NULL;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp8_ = persistent_username;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp6_ = _tmp8_ != NULL;
+#line 3122 "PiwigoPublishing.c"
+	} else {
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp6_ = FALSE;
+#line 3126 "PiwigoPublishing.c"
+	}
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp6_) {
+#line 3130 "PiwigoPublishing.c"
+		const gchar* _tmp9_ = NULL;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp9_ = persistent_password;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp5_ = _tmp9_ != NULL;
+#line 3136 "PiwigoPublishing.c"
+	} else {
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp5_ = FALSE;
+#line 3140 "PiwigoPublishing.c"
+	}
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp5_) {
+#line 3144 "PiwigoPublishing.c"
+		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
+		gboolean _tmp13_ = FALSE;
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp10_ = persistent_url;
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp11_ = persistent_username;
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp12_ = persistent_password;
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
+#line 3159 "PiwigoPublishing.c"
+	} else {
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
+#line 3163 "PiwigoPublishing.c"
+	}
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_password);
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_username);
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_url);
+#line 3171 "PiwigoPublishing.c"
+}
+
+
+static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__lambda6_ ((PublishingPiwigoPiwigoPublisher*) self);
+#line 3178 "PiwigoPublishing.c"
+}
+
+
+static void _vala_SoupURI_free (SoupURI* self) {
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_boxed_free (soup_uri_get_type (), self);
+#line 3185 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url) {
+	SoupURI* uri = NULL;
+	const gchar* _tmp0_ = NULL;
+	SoupURI* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp2_ = NULL;
+	PublishingPiwigoSSLErrorPane* ssl_pane = NULL;
+	PublishingPiwigoSessionLoginTransaction* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	PublishingPiwigoSSLErrorPane* _tmp5_ = NULL;
+	SpitPublishingPluginHost* _tmp6_ = NULL;
+	SpitPublishingPluginHost* _tmp7_ = NULL;
+	GtkWidget* _tmp8_ = NULL;
+	GtkWidget* _tmp9_ = NULL;
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (trans));
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (url != NULL);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = url;
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = soup_uri_new (_tmp0_);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	uri = _tmp1_;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = self->priv->host;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp2_, FALSE);
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = trans;
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = soup_uri_get_host (uri);
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = publishing_piwigo_ssl_error_pane_new (_tmp3_, _tmp4_);
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	ssl_pane = _tmp5_;
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda6__publishing_piwigo_ssl_error_pane_proceed, self, 0);
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = self->priv->host;
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = self->priv->host;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = publishing_piwigo_ssl_error_pane_get_default_widget (ssl_pane);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp9_ = _tmp8_;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp7_, _tmp9_);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp9_);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (ssl_pane);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__vala_SoupURI_free0 (uri);
+#line 3246 "PiwigoPublishing.c"
 }
 
 
@@ -3026,35 +3265,35 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (password != NULL);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:301: EVENT: on_authentication_pane_login_clicked");
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:325: EVENT: on_authentication_pane_login_clicked");
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp0_) {
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3045 "PiwigoPublishing.c"
+#line 3283 "PiwigoPublishing.c"
 	}
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = password;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = remember_password;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3057 "PiwigoPublishing.c"
+#line 3295 "PiwigoPublishing.c"
 }
 
 
@@ -3070,16 +3309,16 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
      * @param password the password of the Piwigo user used to login
      */
 static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3075 "PiwigoPublishing.c"
+#line 3313 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3082 "PiwigoPublishing.c"
+#line 3320 "PiwigoPublishing.c"
 }
 
 
@@ -3098,88 +3337,88 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	PublishingPiwigoSessionLoginTransaction* _tmp11_ = NULL;
 	PublishingPiwigoSessionLoginTransaction* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (password != NULL);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:320: ACTION: logging in");
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:344: ACTION: logging in");
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = remember_password;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_remember_password (self, _tmp2_);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = remember_password;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp3_) {
-#line 3127 "PiwigoPublishing.c"
+#line 3365 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = password;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3133 "PiwigoPublishing.c"
+#line 3371 "PiwigoPublishing.c"
 	} else {
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3137 "PiwigoPublishing.c"
+#line 3375 "PiwigoPublishing.c"
 	}
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->session;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = url;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishing_piwigo_piwigo_publisher_normalise_url (_tmp6_);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = username;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = password;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = publishing_piwigo_session_login_transaction_new (_tmp5_, _tmp8_, _tmp9_, _tmp10_);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	login_trans = _tmp12_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3163 "PiwigoPublishing.c"
+#line 3401 "PiwigoPublishing.c"
 	{
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3171 "PiwigoPublishing.c"
+#line 3409 "PiwigoPublishing.c"
 				goto __catch32_spit_publishing_publishing_error;
 			}
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3182 "PiwigoPublishing.c"
+#line 3420 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally32;
@@ -3187,36 +3426,53 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:338: ERROR: do_network_login");
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = err;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp13_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
+#line 3436 "PiwigoPublishing.c"
+			const gchar* _tmp14_ = NULL;
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:363: ERROR: SSL connection problems");
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp14_ = url;
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
+#line 3444 "PiwigoPublishing.c"
+		} else {
+			GError* _tmp15_ = NULL;
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:366: ERROR: do_network_login");
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp15_ = err;
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
+#line 3453 "PiwigoPublishing.c"
+		}
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 3202 "PiwigoPublishing.c"
+#line 3457 "PiwigoPublishing.c"
 	}
 	__finally32:
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (login_trans);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3215 "PiwigoPublishing.c"
+#line 3470 "PiwigoPublishing.c"
 	}
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3219 "PiwigoPublishing.c"
+#line 3474 "PiwigoPublishing.c"
 }
 
 
@@ -3230,95 +3486,95 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 	gboolean _tmp10_ = FALSE;
 	const gchar* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = url;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	norm_url = _tmp1_;
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = norm_url;
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_str_has_suffix (_tmp2_, ".php");
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 3247 "PiwigoPublishing.c"
+#line 3502 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = norm_url;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_str_has_suffix (_tmp4_, "/");
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (!_tmp5_) {
-#line 3258 "PiwigoPublishing.c"
+#line 3513 "PiwigoPublishing.c"
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = norm_url;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = g_strconcat (_tmp6_, "/", NULL);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (norm_url);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			norm_url = _tmp7_;
-#line 3269 "PiwigoPublishing.c"
+#line 3524 "PiwigoPublishing.c"
 		}
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = norm_url;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = g_strconcat (_tmp8_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp9_;
-#line 3279 "PiwigoPublishing.c"
+#line 3534 "PiwigoPublishing.c"
 	}
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = norm_url;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = g_str_has_prefix (_tmp11_, "http://");
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp12_) {
-#line 3287 "PiwigoPublishing.c"
+#line 3542 "PiwigoPublishing.c"
 		const gchar* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = norm_url;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = g_str_has_prefix (_tmp13_, "https://");
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = !_tmp14_;
-#line 3296 "PiwigoPublishing.c"
+#line 3551 "PiwigoPublishing.c"
 	} else {
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = FALSE;
-#line 3300 "PiwigoPublishing.c"
+#line 3555 "PiwigoPublishing.c"
 	}
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp10_) {
-#line 3304 "PiwigoPublishing.c"
+#line 3559 "PiwigoPublishing.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = norm_url;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = g_strconcat ("http://", _tmp15_, NULL);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp16_;
-#line 3315 "PiwigoPublishing.c"
+#line 3570 "PiwigoPublishing.c"
 	}
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = norm_url;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3321 "PiwigoPublishing.c"
+#line 3576 "PiwigoPublishing.c"
 }
 
 
@@ -3338,18 +3594,18 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_piwigo_transaction_validate_xml (doc);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3343 "PiwigoPublishing.c"
+#line 3598 "PiwigoPublishing.c"
 }
 
 
 static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_piwigo_transaction_get_error_code (doc);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3352 "PiwigoPublishing.c"
+#line 3607 "PiwigoPublishing.c"
 }
 
 
@@ -3367,111 +3623,110 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 	gchar* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
 	PublishingPiwigoSession* _tmp25_ = NULL;
-	PublishingPiwigoSession* _tmp26_ = NULL;
+	const gchar* _tmp26_ = NULL;
 	const gchar* _tmp27_ = NULL;
 	const gchar* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:374: EVENT: on_login_network_complete");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:403: EVENT: on_login_network_complete");
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3393 "PiwigoPublishing.c"
+#line 3647 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp8_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp6_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3418 "PiwigoPublishing.c"
+#line 3672 "PiwigoPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3427 "PiwigoPublishing.c"
+#line 3681 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally33;
 	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 3438 "PiwigoPublishing.c"
+#line 3692 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportTransaction* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
 			PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = txn;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = _tmp10_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp13_ = _tmp12_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_tmp13_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (_tmp11_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3463 "PiwigoPublishing.c"
+#line 3717 "PiwigoPublishing.c"
 					goto __catch34_spit_publishing_publishing_error;
 				}
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				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 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3474 "PiwigoPublishing.c"
+#line 3728 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally34;
@@ -3483,116 +3738,110 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			const gchar* _tmp15_ = NULL;
 			gint _tmp16_ = 0;
 			gint _tmp17_ = 0;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code = _inner_error_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = code;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = _tmp14_->message;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = atoi (_tmp15_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code_int = _tmp16_;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = code_int;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp17_ == 999) {
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:389: ERROR: on_login_network_complete, code 999");
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:418: ERROR: on_login_network_complete, code 999");
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3506 "PiwigoPublishing.c"
+#line 3760 "PiwigoPublishing.c"
 			} else {
 				GError* _tmp18_ = NULL;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:392: ERROR: on_login_network_complete");
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:421: ERROR: on_login_network_complete");
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = err;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3515 "PiwigoPublishing.c"
+#line 3769 "PiwigoPublishing.c"
 			}
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (code);
-#line 3519 "PiwigoPublishing.c"
+#line 3773 "PiwigoPublishing.c"
 		}
 		__finally34:
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3534 "PiwigoPublishing.c"
+#line 3788 "PiwigoPublishing.c"
 		}
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3540 "PiwigoPublishing.c"
+#line 3794 "PiwigoPublishing.c"
 	}
 	__finally33:
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3551 "PiwigoPublishing.c"
+#line 3805 "PiwigoPublishing.c"
 	}
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = txn;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = publishing_rest_support_transaction_get_endpoint_url (_tmp19_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	endpoint_url = _tmp20_;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = endpoint_url;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:400: Setting endpoint URL to %s", _tmp21_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:429: Setting endpoint URL to %s", _tmp21_);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = txn;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, _tmp22_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	pwg_id = _tmp23_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = pwg_id;
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:431: Setting session pwg_id to %s", _tmp24_);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp25_ = self->priv->session;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp26_ = pwg_id;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_piwigo_session_set_pwg_id (_tmp25_, _tmp26_);
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp27_ = endpoint_url;
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp28_ = pwg_id;
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp27_, _tmp28_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:402: Setting session pwg_id to %s", _tmp24_);
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = publishing_piwigo_session_new ();
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->session = _tmp25_;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = self->priv->session;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = pwg_id;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_session_set_pwg_id (_tmp26_, _tmp27_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = endpoint_url;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp29_ = pwg_id;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp28_, _tmp29_);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (pwg_id);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (endpoint_url);
-#line 3595 "PiwigoPublishing.c"
+#line 3843 "PiwigoPublishing.c"
 }
 
 
@@ -3614,37 +3863,37 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
 	guint _tmp3_ = 0U;
 	PublishingPiwigoSession* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:424: EVENT: on_login_network_error");
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:452: EVENT: on_login_network_error");
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3643 "PiwigoPublishing.c"
+#line 3891 "PiwigoPublishing.c"
 	}
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3647 "PiwigoPublishing.c"
+#line 3895 "PiwigoPublishing.c"
 }
 
 
@@ -3659,16 +3908,16 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
      * identity.
      */
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3664 "PiwigoPublishing.c"
+#line 3912 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3671 "PiwigoPublishing.c"
+#line 3919 "PiwigoPublishing.c"
 }
 
 
@@ -3678,29 +3927,29 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 	PublishingPiwigoSession* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (pwg_id != NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:445: ACTION: fetching session status");
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:473: ACTION: fetching session status");
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 3703 "PiwigoPublishing.c"
+#line 3951 "PiwigoPublishing.c"
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
 		PublishingPiwigoSession* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
@@ -3708,47 +3957,47 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		PublishingPiwigoSessionGetStatusTransaction* _tmp7_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp8_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp9_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->session;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = url;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = pwg_id;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp4_, _tmp5_, _tmp6_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		status_txn = _tmp7_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = status_txn;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = status_txn;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3729 "PiwigoPublishing.c"
+#line 3977 "PiwigoPublishing.c"
 		{
 			PublishingPiwigoSessionGetStatusTransaction* _tmp10_ = NULL;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = status_txn;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3740 "PiwigoPublishing.c"
+#line 3988 "PiwigoPublishing.c"
 					goto __catch35_spit_publishing_publishing_error;
 				}
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				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 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3751 "PiwigoPublishing.c"
+#line 3999 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally35;
@@ -3756,80 +4005,80 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		{
 			GError* err = NULL;
 			GError* _tmp11_ = NULL;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:457: ERROR: do_fetch_session_status, not authent" \
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:485: ERROR: do_fetch_session_status, not authent" \
 "icated");
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = err;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 3771 "PiwigoPublishing.c"
+#line 4019 "PiwigoPublishing.c"
 		}
 		__finally35:
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (status_txn);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3784 "PiwigoPublishing.c"
+#line 4032 "PiwigoPublishing.c"
 		}
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 3788 "PiwigoPublishing.c"
+#line 4036 "PiwigoPublishing.c"
 	} else {
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
 		PublishingPiwigoSession* _tmp12_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp13_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp14_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp15_ = NULL;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = self->priv->session;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = publishing_piwigo_session_get_status_transaction_new (_tmp12_);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		status_txn = _tmp13_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = status_txn;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = status_txn;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3809 "PiwigoPublishing.c"
+#line 4057 "PiwigoPublishing.c"
 		{
 			PublishingPiwigoSessionGetStatusTransaction* _tmp16_ = NULL;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = status_txn;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3820 "PiwigoPublishing.c"
+#line 4068 "PiwigoPublishing.c"
 					goto __catch36_spit_publishing_publishing_error;
 				}
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				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 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3831 "PiwigoPublishing.c"
+#line 4079 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally36;
@@ -3837,37 +4086,37 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		{
 			GError* err = NULL;
 			GError* _tmp17_ = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:468: ERROR: do_fetch_session_status, authenticat" \
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:496: ERROR: do_fetch_session_status, authenticat" \
 "ed");
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = err;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 3851 "PiwigoPublishing.c"
+#line 4099 "PiwigoPublishing.c"
 		}
 		__finally36:
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (status_txn);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3864 "PiwigoPublishing.c"
+#line 4112 "PiwigoPublishing.c"
 		}
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 3868 "PiwigoPublishing.c"
+#line 4116 "PiwigoPublishing.c"
 	}
 }
 
@@ -3887,31 +4136,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 	PublishingPiwigoSession* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:482: EVENT: on_session_get_status_complete");
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:510: EVENT: on_session_get_status_complete");
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp5_) {
-#line 3912 "PiwigoPublishing.c"
+#line 4160 "PiwigoPublishing.c"
 		gchar* endpoint_url = NULL;
 		PublishingRESTSupportTransaction* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -3919,23 +4168,23 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 		PublishingPiwigoSession* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = txn;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_transaction_get_endpoint_url (_tmp6_);
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		endpoint_url = _tmp7_;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->session;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_piwigo_session_get_pwg_id (_tmp8_);
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		pwg_id = _tmp9_;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = pwg_id;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:489: Fetching session status for pwg_id %s", _tmp10_);
-#line 3936 "PiwigoPublishing.c"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:517: Fetching session status for pwg_id %s", _tmp10_);
+#line 4184 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportXmlDocument* doc = NULL;
 			PublishingRESTSupportTransaction* _tmp11_ = NULL;
@@ -3947,46 +4196,46 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
 			xmlNode* _tmp17_ = NULL;
 			xmlNode* username_node = NULL;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = txn;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp12_ = publishing_rest_support_transaction_get_response (_tmp11_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp13_ = _tmp12_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = publishing_rest_support_xml_document_parse_string (_tmp13_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = _tmp14_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (_tmp13_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			doc = _tmp15_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3966 "PiwigoPublishing.c"
+#line 4214 "PiwigoPublishing.c"
 					goto __catch37_spit_publishing_publishing_error;
 				}
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				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 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3979 "PiwigoPublishing.c"
+#line 4227 "PiwigoPublishing.c"
 			}
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = doc;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			root = _tmp17_;
-#line 3987 "PiwigoPublishing.c"
+#line 4235 "PiwigoPublishing.c"
 			{
 				xmlNode* _tmp18_ = NULL;
 				PublishingRESTSupportXmlDocument* _tmp19_ = NULL;
@@ -4006,189 +4255,189 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				PublishingPiwigoSession* _tmp32_ = NULL;
 				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp19_ = doc;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp20_ = root;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "username", &_inner_error_);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = _tmp21_;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4019 "PiwigoPublishing.c"
+#line 4267 "PiwigoPublishing.c"
 						goto __catch38_spit_publishing_publishing_error;
 					}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (pwg_id);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (endpoint_url);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					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 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4034 "PiwigoPublishing.c"
+#line 4282 "PiwigoPublishing.c"
 				}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				username_node = _tmp18_;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp22_ = username_node;
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp23_ = (gchar*) xmlNodeGetContent (_tmp22_);
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				username = _tmp23_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp24_ = username;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:500: Returned username is %s", _tmp24_);
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:528: Returned username is %s", _tmp24_);
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp25_ = self->priv->session;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp26_ = endpoint_url;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp27_ = username;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp28_ = pwg_id;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_session_authenticate (_tmp25_, _tmp26_, _tmp27_, _tmp28_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp29_ = self->priv->session;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp30_ = publishing_piwigo_session_get_pwg_url (_tmp29_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp31_ = _tmp30_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp31_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp31_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp32_ = self->priv->session;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp33_ = publishing_piwigo_session_get_username (_tmp32_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp34_ = _tmp33_;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp34_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp34_);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (username);
-#line 4082 "PiwigoPublishing.c"
+#line 4330 "PiwigoPublishing.c"
 			}
 			goto __finally38;
 			__catch38_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
 				GError* _tmp35_ = NULL;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				err2 = _inner_error_;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_inner_error_ = NULL;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:506: ERROR: on_session_get_status_complete, inne" \
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:534: ERROR: on_session_get_status_complete, inne" \
 "r");
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp35_ = err2;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp35_);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err2);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4109 "PiwigoPublishing.c"
+#line 4357 "PiwigoPublishing.c"
 			}
 			__finally38:
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4118 "PiwigoPublishing.c"
+#line 4366 "PiwigoPublishing.c"
 					goto __catch37_spit_publishing_publishing_error;
 				}
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				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 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4133 "PiwigoPublishing.c"
+#line 4381 "PiwigoPublishing.c"
 			}
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 4137 "PiwigoPublishing.c"
+#line 4385 "PiwigoPublishing.c"
 		}
 		goto __finally37;
 		__catch37_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp36_ = NULL;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:511: ERROR: on_session_get_status_complete, oute" \
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:539: ERROR: on_session_get_status_complete, oute" \
 "r");
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp36_ = err;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp36_);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (pwg_id);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (endpoint_url);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4162 "PiwigoPublishing.c"
+#line 4410 "PiwigoPublishing.c"
 		}
 		__finally37:
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (pwg_id);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (endpoint_url);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4177 "PiwigoPublishing.c"
+#line 4425 "PiwigoPublishing.c"
 		}
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (pwg_id);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (endpoint_url);
-#line 4183 "PiwigoPublishing.c"
+#line 4431 "PiwigoPublishing.c"
 	} else {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4187 "PiwigoPublishing.c"
+#line 4435 "PiwigoPublishing.c"
 	}
 }
 
@@ -4203,31 +4452,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:530: EVENT: on_session_get_status_error");
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:558: EVENT: on_session_get_status_error");
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4226 "PiwigoPublishing.c"
+#line 4474 "PiwigoPublishing.c"
 }
 
 
@@ -4238,16 +4487,16 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
      * to populate the publishing pane presented to the user.
      */
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4239 "PiwigoPublishing.c"
+#line 4487 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4246 "PiwigoPublishing.c"
+#line 4494 "PiwigoPublishing.c"
 }
 
 
@@ -4258,48 +4507,48 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	PublishingPiwigoSession* _tmp2_ = NULL;
 	PublishingPiwigoCategoriesGetListTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:543: ACTION: fetching categories");
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:571: ACTION: fetching categories");
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_categories_get_list_transaction_new (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	cat_trans = _tmp3_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4279 "PiwigoPublishing.c"
+#line 4527 "PiwigoPublishing.c"
 	{
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4287 "PiwigoPublishing.c"
+#line 4535 "PiwigoPublishing.c"
 				goto __catch39_spit_publishing_publishing_error;
 			}
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4298 "PiwigoPublishing.c"
+#line 4546 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally39;
@@ -4307,36 +4556,36 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:554: ERROR: do_fetch_categories");
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:582: ERROR: do_fetch_categories");
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = err;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 4318 "PiwigoPublishing.c"
+#line 4566 "PiwigoPublishing.c"
 	}
 	__finally39:
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 4331 "PiwigoPublishing.c"
+#line 4579 "PiwigoPublishing.c"
 	}
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4335 "PiwigoPublishing.c"
+#line 4583 "PiwigoPublishing.c"
 }
 
 
@@ -4348,19 +4597,19 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
      * publishing options pane.
      */
 static void _vala_array_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4353 "PiwigoPublishing.c"
+#line 4601 "PiwigoPublishing.c"
 	}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4359 "PiwigoPublishing.c"
+#line 4607 "PiwigoPublishing.c"
 }
 
 
@@ -4375,49 +4624,49 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 	PublishingPiwigoCategory** _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:567: EVENT: on_category_fetch_complete");
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:595: EVENT: on_category_fetch_complete");
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = txn;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:570: PiwigoConnector: list of categories: %s", _tmp6_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:598: PiwigoConnector: list of categories: %s", _tmp6_);
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->categories;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = self->priv->categories_length1;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories = NULL;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories_length1 = 0;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4416 "PiwigoPublishing.c"
+#line 4664 "PiwigoPublishing.c"
 	}
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
@@ -4443,73 +4692,73 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		gchar* _tmp20_ = NULL;
 		gchar* uppercats = NULL;
 		gchar* _tmp21_ = NULL;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = txn;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = _tmp11_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp10_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		doc = _tmp12_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4460 "PiwigoPublishing.c"
+#line 4708 "PiwigoPublishing.c"
 				goto __catch40_spit_publishing_publishing_error;
 			}
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4469 "PiwigoPublishing.c"
+#line 4717 "PiwigoPublishing.c"
 		}
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = doc;
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = publishing_rest_support_xml_document_get_root_node (_tmp13_);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		root = _tmp14_;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = root;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = xmlFirstElementChild (_tmp15_);
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		categories_node = _tmp16_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = categories_node;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = _tmp17_->children;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		category_node_iter = _tmp18_;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = g_strdup ("");
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		name = _tmp19_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = g_strdup ("");
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_string = _tmp20_;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = g_strdup ("");
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		uppercats = _tmp21_;
-#line 4501 "PiwigoPublishing.c"
+#line 4749 "PiwigoPublishing.c"
 		{
 			gboolean _tmp22_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp22_ = TRUE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 4508 "PiwigoPublishing.c"
+#line 4756 "PiwigoPublishing.c"
 				xmlNode* _tmp25_ = NULL;
 				xmlNode* _tmp26_ = NULL;
 				PublishingRESTSupportXmlDocument* _tmp27_ = NULL;
@@ -4534,186 +4783,186 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 				const gchar* _tmp45_ = NULL;
 				const gchar* _tmp46_ = NULL;
 				PublishingPiwigoCategory* _tmp47_ = NULL;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp22_) {
-#line 4535 "PiwigoPublishing.c"
+#line 4783 "PiwigoPublishing.c"
 					xmlNode* _tmp23_ = NULL;
 					xmlNode* _tmp24_ = NULL;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp23_ = category_node_iter;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp24_ = _tmp23_->next;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					category_node_iter = _tmp24_;
-#line 4544 "PiwigoPublishing.c"
+#line 4792 "PiwigoPublishing.c"
 				}
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp22_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp25_ = category_node_iter;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp25_ != NULL)) {
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 4554 "PiwigoPublishing.c"
+#line 4802 "PiwigoPublishing.c"
 				}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp27_ = doc;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp28_ = category_node_iter;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp29_ = publishing_rest_support_xml_document_get_named_child (_tmp27_, _tmp28_, "name", &_inner_error_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp26_ = _tmp29_;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4576 "PiwigoPublishing.c"
+#line 4824 "PiwigoPublishing.c"
 						goto __catch40_spit_publishing_publishing_error;
 					}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					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 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4593 "PiwigoPublishing.c"
+#line 4841 "PiwigoPublishing.c"
 				}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				name_node = _tmp26_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp30_ = name_node;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (name);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				name = _tmp31_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp33_ = doc;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp34_ = category_node_iter;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp35_ = publishing_rest_support_xml_document_get_named_child (_tmp33_, _tmp34_, "uppercats", &_inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp32_ = _tmp35_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4625 "PiwigoPublishing.c"
+#line 4873 "PiwigoPublishing.c"
 						goto __catch40_spit_publishing_publishing_error;
 					}
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					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 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4642 "PiwigoPublishing.c"
+#line 4890 "PiwigoPublishing.c"
 				}
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				uppercats_node = _tmp32_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp36_ = uppercats_node;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp37_ = (gchar*) xmlNodeGetContent (_tmp36_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (uppercats);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				uppercats = (gchar*) _tmp37_;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp38_ = category_node_iter;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp39_ = (gchar*) xmlGetProp (_tmp38_, (xmlChar*) "id");
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (id_string);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				id_string = _tmp39_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp40_ = self->priv->categories;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp40__length1 = self->priv->categories_length1;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp40_ == NULL) {
-#line 4668 "PiwigoPublishing.c"
+#line 4916 "PiwigoPublishing.c"
 					PublishingPiwigoCategory** _tmp41_ = NULL;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp41_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories = _tmp41_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories_length1 = 0;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4680 "PiwigoPublishing.c"
+#line 4928 "PiwigoPublishing.c"
 				}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp42_ = self->priv->categories;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp42__length1 = self->priv->categories_length1;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp43_ = id_string;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp44_ = atoi (_tmp43_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp45_ = name;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp46_ = uppercats;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp47_ = publishing_piwigo_category_new (_tmp44_, _tmp45_, _tmp46_, "");
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp47_);
-#line 4698 "PiwigoPublishing.c"
+#line 4946 "PiwigoPublishing.c"
 			}
 		}
 		{
 			gint i = 0;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			i = 0;
-#line 4705 "PiwigoPublishing.c"
+#line 4953 "PiwigoPublishing.c"
 			{
 				gboolean _tmp48_ = FALSE;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp48_ = TRUE;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				while (TRUE) {
-#line 4712 "PiwigoPublishing.c"
+#line 4960 "PiwigoPublishing.c"
 					gint _tmp50_ = 0;
 					PublishingPiwigoCategory** _tmp51_ = NULL;
 					gint _tmp51__length1 = 0;
@@ -4736,111 +4985,111 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					GString* _tmp87_ = NULL;
 					const gchar* _tmp88_ = NULL;
 					gchar* _tmp89_ = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (!_tmp48_) {
-#line 4737 "PiwigoPublishing.c"
+#line 4985 "PiwigoPublishing.c"
 						gint _tmp49_ = 0;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp49_ = i;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						i = _tmp49_ + 1;
-#line 4743 "PiwigoPublishing.c"
+#line 4991 "PiwigoPublishing.c"
 					}
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp48_ = FALSE;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp50_ = i;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp51_ = self->priv->categories;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp51__length1 = self->priv->categories_length1;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (!(_tmp50_ < _tmp51__length1)) {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						break;
-#line 4757 "PiwigoPublishing.c"
+#line 5005 "PiwigoPublishing.c"
 					}
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp52_ = self->priv->categories;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp52__length1 = self->priv->categories_length1;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp53_ = i;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp54_ = _tmp52_[_tmp53_];
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp55_ = _tmp54_->uppercats;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp57_ = _tmp56_ = g_strsplit (_tmp55_, ",", 0);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids = _tmp57_;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids_length1 = _vala_array_length (_tmp56_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_upcatids_size_ = upcatids_length1;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp58_ = g_string_new ("");
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					builder = _tmp58_;
-#line 4781 "PiwigoPublishing.c"
+#line 5029 "PiwigoPublishing.c"
 					{
 						gint j = 0;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						j = 0;
-#line 4786 "PiwigoPublishing.c"
+#line 5034 "PiwigoPublishing.c"
 						{
 							gboolean _tmp59_ = FALSE;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp59_ = TRUE;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							while (TRUE) {
-#line 4793 "PiwigoPublishing.c"
+#line 5041 "PiwigoPublishing.c"
 								gint _tmp61_ = 0;
 								gchar** _tmp62_ = NULL;
 								gint _tmp62__length1 = 0;
 								GString* _tmp63_ = NULL;
 								GString* _tmp83_ = NULL;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (!_tmp59_) {
-#line 4801 "PiwigoPublishing.c"
+#line 5049 "PiwigoPublishing.c"
 									gint _tmp60_ = 0;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_tmp60_ = j;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									j = _tmp60_ + 1;
-#line 4807 "PiwigoPublishing.c"
+#line 5055 "PiwigoPublishing.c"
 								}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp59_ = FALSE;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp61_ = j;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp62_ = upcatids;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp62__length1 = upcatids_length1;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (!(_tmp61_ < _tmp62__length1)) {
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									break;
-#line 4821 "PiwigoPublishing.c"
+#line 5069 "PiwigoPublishing.c"
 								}
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp63_ = builder;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								g_string_append (_tmp63_, "/ ");
-#line 4827 "PiwigoPublishing.c"
+#line 5075 "PiwigoPublishing.c"
 								{
 									gint k = 0;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									k = 0;
-#line 4832 "PiwigoPublishing.c"
+#line 5080 "PiwigoPublishing.c"
 									{
 										gboolean _tmp64_ = FALSE;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 										_tmp64_ = TRUE;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 										while (TRUE) {
-#line 4839 "PiwigoPublishing.c"
+#line 5087 "PiwigoPublishing.c"
 											gint _tmp66_ = 0;
 											PublishingPiwigoCategory** _tmp67_ = NULL;
 											gint _tmp67__length1 = 0;
@@ -4856,165 +5105,165 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 											gchar* _tmp75_ = NULL;
 											gchar* _tmp76_ = NULL;
 											gboolean _tmp77_ = FALSE;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											if (!_tmp64_) {
-#line 4857 "PiwigoPublishing.c"
+#line 5105 "PiwigoPublishing.c"
 												gint _tmp65_ = 0;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp65_ = k;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												k = _tmp65_ + 1;
-#line 4863 "PiwigoPublishing.c"
+#line 5111 "PiwigoPublishing.c"
 											}
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp64_ = FALSE;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp66_ = k;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp67_ = self->priv->categories;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp67__length1 = self->priv->categories_length1;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											if (!(_tmp66_ < _tmp67__length1)) {
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												break;
-#line 4877 "PiwigoPublishing.c"
+#line 5125 "PiwigoPublishing.c"
 											}
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp68_ = upcatids;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp68__length1 = upcatids_length1;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp69_ = j;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp70_ = _tmp68_[_tmp69_];
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp71_ = self->priv->categories;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp71__length1 = self->priv->categories_length1;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp72_ = k;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp73_ = _tmp71_[_tmp72_];
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp74_ = _tmp73_->id;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp75_ = g_strdup_printf ("%i", _tmp74_);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp76_ = _tmp75_;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_tmp77_ = g_strcmp0 (_tmp70_, _tmp76_) == 0;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											_g_free0 (_tmp76_);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 											if (_tmp77_) {
-#line 4907 "PiwigoPublishing.c"
+#line 5155 "PiwigoPublishing.c"
 												GString* _tmp78_ = NULL;
 												PublishingPiwigoCategory** _tmp79_ = NULL;
 												gint _tmp79__length1 = 0;
 												gint _tmp80_ = 0;
 												PublishingPiwigoCategory* _tmp81_ = NULL;
 												const gchar* _tmp82_ = NULL;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp78_ = builder;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp79_ = self->priv->categories;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp79__length1 = self->priv->categories_length1;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp80_ = k;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp81_ = _tmp79_[_tmp80_];
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												_tmp82_ = _tmp81_->name;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												g_string_append (_tmp78_, _tmp82_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 												break;
-#line 4930 "PiwigoPublishing.c"
+#line 5178 "PiwigoPublishing.c"
 											}
 										}
 									}
 								}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp83_ = builder;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								g_string_append (_tmp83_, " ");
-#line 4939 "PiwigoPublishing.c"
+#line 5187 "PiwigoPublishing.c"
 							}
 						}
 					}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp84_ = self->priv->categories;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp84__length1 = self->priv->categories_length1;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp85_ = i;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp86_ = _tmp84_[_tmp85_];
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp87_ = builder;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp88_ = _tmp87_->str;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp89_ = g_strdup (_tmp88_);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (_tmp86_->display_name);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp86_->display_name = _tmp89_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_string_free0 (builder);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 4965 "PiwigoPublishing.c"
+#line 5213 "PiwigoPublishing.c"
 				}
 			}
 		}
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uppercats);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (id_string);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4977 "PiwigoPublishing.c"
+#line 5225 "PiwigoPublishing.c"
 	}
 	goto __finally40;
 	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp90_ = NULL;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:622: ERROR: on_category_fetch_complete");
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:650: ERROR: on_category_fetch_complete");
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp90_ = err;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp90_);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 4998 "PiwigoPublishing.c"
+#line 5246 "PiwigoPublishing.c"
 	}
 	__finally40:
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5009 "PiwigoPublishing.c"
+#line 5257 "PiwigoPublishing.c"
 	}
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5013 "PiwigoPublishing.c"
+#line 5261 "PiwigoPublishing.c"
 }
 
 
@@ -5029,31 +5278,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:638: EVENT: on_category_fetch_error");
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:666: EVENT: on_category_fetch_error");
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5052 "PiwigoPublishing.c"
+#line 5300 "PiwigoPublishing.c"
 }
 
 
@@ -5063,16 +5312,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
      * This action method shows the publishing options pane.
      */
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5064 "PiwigoPublishing.c"
+#line 5312 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5071 "PiwigoPublishing.c"
+#line 5319 "PiwigoPublishing.c"
 }
 
 
@@ -5092,55 +5341,55 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp10_ = NULL;
 	GtkWidget* _tmp11_ = NULL;
 	GtkWidget* _tmp12_ = NULL;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:650: ACTION: installing publishing options pane");
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:678: ACTION: installing publishing options pane");
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->categories;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = self->priv->categories_length1;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_piwigo_publisher_get_last_category (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_piwigo_publisher_get_last_permission_level (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_piwigo_publisher_get_last_photo_size (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	opts_pane = _tmp8_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "logout", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout, self, 0);
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "publish", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish, self, 0);
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = self->priv->host;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = publishing_piwigo_publishing_options_pane_get_default_widget (opts_pane);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_dialog_default_widget (_tmp10_, _tmp12_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp12_);
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 5139 "PiwigoPublishing.c"
+#line 5387 "PiwigoPublishing.c"
 }
 
 
@@ -5148,16 +5397,16 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
      * Event triggered when the user clicks logout in the publishing options pane.
      */
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5149 "PiwigoPublishing.c"
+#line 5397 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5156 "PiwigoPublishing.c"
+#line 5404 "PiwigoPublishing.c"
 }
 
 
@@ -5166,41 +5415,41 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSessionLogoutTransaction* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:666: EVENT: on_publishing_options_pane_logout_cl" \
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:694: EVENT: on_publishing_options_pane_logout_cl" \
 "icked");
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_piwigo_session_logout_transaction_new (_tmp0_);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	logout_trans = _tmp1_;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5179 "PiwigoPublishing.c"
+#line 5427 "PiwigoPublishing.c"
 	{
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5187 "PiwigoPublishing.c"
+#line 5435 "PiwigoPublishing.c"
 				goto __catch41_spit_publishing_publishing_error;
 			}
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5198 "PiwigoPublishing.c"
+#line 5446 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally41;
@@ -5208,37 +5457,37 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:674: ERROR: on_publishing_options_pane_logout_cl" \
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:702: ERROR: on_publishing_options_pane_logout_cl" \
 "icked");
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = err;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5218 "PiwigoPublishing.c"
+#line 5466 "PiwigoPublishing.c"
 	}
 	__finally41:
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5231 "PiwigoPublishing.c"
+#line 5479 "PiwigoPublishing.c"
 	}
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5235 "PiwigoPublishing.c"
+#line 5483 "PiwigoPublishing.c"
 }
 
 
@@ -5254,31 +5503,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
 	PublishingRESTSupportTransaction* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	PublishingPiwigoSession* _tmp4_ = NULL;
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:686: EVENT: on_logout_network_complete");
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:714: EVENT: on_logout_network_complete");
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_deauthenticate (_tmp4_);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5275 "PiwigoPublishing.c"
+#line 5523 "PiwigoPublishing.c"
 }
 
 
@@ -5292,31 +5541,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:702: EVENT: on_logout_network_error");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:730: EVENT: on_logout_network_error");
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5313 "PiwigoPublishing.c"
+#line 5561 "PiwigoPublishing.c"
 }
 
 
@@ -5331,9 +5580,9 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
      * @param parameters the publishing parameters
      */
 static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5330 "PiwigoPublishing.c"
+#line 5578 "PiwigoPublishing.c"
 }
 
 
@@ -5344,50 +5593,50 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
 	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
 	PublishingPiwigoCategory* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters));
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:720: EVENT: on_publishing_options_pane_publish_c" \
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:748: EVENT: on_publishing_options_pane_publish_c" \
 "licked");
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = parameters;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp0_);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp1_;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = strip_metadata;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata = _tmp2_;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = parameters;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_->category;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 5367 "PiwigoPublishing.c"
+#line 5615 "PiwigoPublishing.c"
 		PublishingPiwigoPublishingParameters* _tmp6_ = NULL;
 		PublishingPiwigoCategory* _tmp7_ = NULL;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = parameters;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_->category;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5376 "PiwigoPublishing.c"
+#line 5624 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->strip_metadata;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5383 "PiwigoPublishing.c"
+#line 5631 "PiwigoPublishing.c"
 	}
 }
 
@@ -5422,21 +5671,21 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5418 "PiwigoPublishing.c"
+#line 5666 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5425 "PiwigoPublishing.c"
+#line 5673 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5432 "PiwigoPublishing.c"
+#line 5680 "PiwigoPublishing.c"
 }
 
 
@@ -5468,100 +5717,100 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 	PublishingPiwigoCategoriesAddTransaction* _tmp23_ = NULL;
 	PublishingPiwigoCategoriesAddTransaction* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (category));
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = category;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _tmp0_->name;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp1_);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:743: %s", _tmp3_);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:771: %s", _tmp3_);
+#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = category;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_assert (_tmp5_, "category.is_local()");
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _ ("Creating album %s...");
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = _ ("Creating album %s…");
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = category;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _tmp9_->name;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp10_);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp12_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = self->priv->session;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = category;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = _tmp14_->name;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = string_strip (_tmp15_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = category;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_->uppercats;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = atoi (_tmp19_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = category;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = _tmp21_->comment;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = publishing_piwigo_categories_add_transaction_new (_tmp13_, _tmp17_, _tmp20_, _tmp22_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = _tmp23_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	creation_trans = _tmp24_;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5538 "PiwigoPublishing.c"
+#line 5786 "PiwigoPublishing.c"
 	{
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5546 "PiwigoPublishing.c"
+#line 5794 "PiwigoPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5557 "PiwigoPublishing.c"
+#line 5805 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally42;
@@ -5569,36 +5818,36 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 	{
 		GError* err = NULL;
 		GError* _tmp25_ = NULL;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:757: ERROR: do_create_category");
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:785: ERROR: do_create_category");
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = err;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp25_);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5577 "PiwigoPublishing.c"
+#line 5825 "PiwigoPublishing.c"
 	}
 	__finally42:
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5590 "PiwigoPublishing.c"
+#line 5838 "PiwigoPublishing.c"
 	}
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5594 "PiwigoPublishing.c"
+#line 5842 "PiwigoPublishing.c"
 }
 
 
@@ -5615,25 +5864,25 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 	PublishingRESTSupportTransaction* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:770: EVENT: on_category_add_complete");
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:798: EVENT: on_category_add_complete");
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5629 "PiwigoPublishing.c"
+#line 5877 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
@@ -5659,129 +5908,129 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		PublishingPiwigoCategory* _tmp20_ = NULL;
 		gint _tmp21_ = 0;
 		gboolean _tmp22_ = FALSE;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp6_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		doc = _tmp8_;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5673 "PiwigoPublishing.c"
+#line 5921 "PiwigoPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5682 "PiwigoPublishing.c"
+#line 5930 "PiwigoPublishing.c"
 		}
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = doc;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		rsp = _tmp10_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = doc;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = rsp;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "id", &_inner_error_);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _tmp14_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5704 "PiwigoPublishing.c"
+#line 5952 "PiwigoPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5715 "PiwigoPublishing.c"
+#line 5963 "PiwigoPublishing.c"
 		}
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_node = _tmp11_;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = id_node;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = (gchar*) xmlNodeGetContent (_tmp15_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_string = _tmp16_;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = id_string;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = atoi (_tmp17_);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id = _tmp18_;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = self->priv->parameters;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = _tmp19_->category;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = id;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_->id = _tmp21_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = self->priv->strip_metadata;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp22_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (id_string);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5747 "PiwigoPublishing.c"
+#line 5995 "PiwigoPublishing.c"
 	}
 	goto __finally43;
 	__catch43_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp23_ = NULL;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:787: ERROR: on_category_add_complete");
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:815: ERROR: on_category_add_complete");
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = err;
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5766 "PiwigoPublishing.c"
+#line 6014 "PiwigoPublishing.c"
 	}
 	__finally43:
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5777 "PiwigoPublishing.c"
+#line 6025 "PiwigoPublishing.c"
 	}
 }
 
@@ -5796,31 +6045,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:799: EVENT: on_category_add_error");
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:827: EVENT: on_category_add_error");
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5816 "PiwigoPublishing.c"
+#line 6064 "PiwigoPublishing.c"
 }
 
 
@@ -5828,23 +6077,23 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
      * Upload action: the big one, the one we've been waiting for!
      */
 static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 5826 "PiwigoPublishing.c"
+#line 6074 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5833 "PiwigoPublishing.c"
+#line 6081 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 5840 "PiwigoPublishing.c"
+#line 6088 "PiwigoPublishing.c"
 }
 
 
@@ -5883,113 +6132,113 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
 	PublishingPiwigoSession* _tmp27_ = NULL;
 	PublishingPiwigoPublishingParameters* _tmp28_ = NULL;
 	PublishingPiwigoUploader* _tmp29_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:810: ACTION: uploading pictures");
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:838: ACTION: uploading pictures");
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_->category;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_->id;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp4_);
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->parameters;
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_->perm_level;
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _tmp6_->id;
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp7_);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = self->priv->parameters;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _tmp8_->photo_size;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _tmp9_->id;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp10_);
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->parameters;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_->title_as_comment;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp12_);
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = self->priv->parameters;
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _tmp13_->no_upload_tags;
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp14_);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = strip_metadata;
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, _tmp15_);
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = self->priv->host;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = self->priv->parameters;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = _tmp17_->photo_size;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_->id;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = self->priv->strip_metadata;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = spit_publishing_plugin_host_serialize_publishables (_tmp16_, _tmp19_, _tmp20_, &_tmp21_, &_tmp22_);
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = _tmp23_;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target = _tmp21_;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp22_;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = self->priv->host;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = spit_publishing_plugin_host_get_publishables (_tmp24_, &_tmp25_);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = _tmp26_;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables_length1 = _tmp25_;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp27_ = self->priv->session;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp28_ = self->priv->parameters;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp29_ = publishing_piwigo_uploader_new (_tmp27_, publishables, publishables_length1, _tmp28_);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	uploader = _tmp29_;
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 5985 "PiwigoPublishing.c"
+#line 6233 "PiwigoPublishing.c"
 }
 
 
@@ -6002,27 +6251,27 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
 	guint _tmp1_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:835: EVENT: on_upload_complete");
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:863: EVENT: on_upload_complete");
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = uploader;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = uploader;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6018 "PiwigoPublishing.c"
+#line 6266 "PiwigoPublishing.c"
 }
 
 
@@ -6036,29 +6285,29 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
 	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:852: EVENT: on_upload_error");
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:880: EVENT: on_upload_error");
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = uploader;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = uploader;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = err;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6054 "PiwigoPublishing.c"
+#line 6302 "PiwigoPublishing.c"
 }
 
 
@@ -6074,38 +6323,38 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp0_) {
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6078 "PiwigoPublishing.c"
+#line 6326 "PiwigoPublishing.c"
 	}
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:866: EVENT: uploader reports upload %.2f percent" \
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:894: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = file_number;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6100 "PiwigoPublishing.c"
+#line 6348 "PiwigoPublishing.c"
 }
 
 
@@ -6115,19 +6364,19 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:877: ACTION: installing success pane");
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:905: ACTION: installing success pane");
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6122 "PiwigoPublishing.c"
+#line 6370 "PiwigoPublishing.c"
 }
 
 
@@ -6136,17 +6385,17 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
      */
 static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
 	GError* _tmp0_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:890: EVENT: on_network_error");
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:918: EVENT: on_network_error");
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = err;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6141 "PiwigoPublishing.c"
+#line 6389 "PiwigoPublishing.c"
 }
 
 
@@ -6163,130 +6412,130 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:898: ACTION: do_show_error");
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:926: ACTION: do_show_error");
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_strdup ("UNKNOWN");
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	error_type = _tmp0_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = e;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (error_type);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6176 "PiwigoPublishing.c"
+#line 6424 "PiwigoPublishing.c"
 	} else {
 		GError* _tmp2_ = NULL;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = e;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6183 "PiwigoPublishing.c"
+#line 6431 "PiwigoPublishing.c"
 			gchar* _tmp3_ = NULL;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (error_type);
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			error_type = _tmp3_;
-#line 6191 "PiwigoPublishing.c"
+#line 6439 "PiwigoPublishing.c"
 		} else {
 			GError* _tmp4_ = NULL;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp4_ = e;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6198 "PiwigoPublishing.c"
+#line 6446 "PiwigoPublishing.c"
 				gchar* _tmp5_ = NULL;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = g_strdup ("PROTOCOL_ERROR");
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (error_type);
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				error_type = _tmp5_;
-#line 6206 "PiwigoPublishing.c"
+#line 6454 "PiwigoPublishing.c"
 			} else {
 				GError* _tmp6_ = NULL;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = e;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6213 "PiwigoPublishing.c"
+#line 6461 "PiwigoPublishing.c"
 					gchar* _tmp7_ = NULL;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp7_ = g_strdup ("SERVICE_ERROR");
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (error_type);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					error_type = _tmp7_;
-#line 6221 "PiwigoPublishing.c"
+#line 6469 "PiwigoPublishing.c"
 				} else {
 					GError* _tmp8_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = e;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6228 "PiwigoPublishing.c"
+#line 6476 "PiwigoPublishing.c"
 						gchar* _tmp9_ = NULL;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (error_type);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						error_type = _tmp9_;
-#line 6236 "PiwigoPublishing.c"
+#line 6484 "PiwigoPublishing.c"
 					} else {
 						GError* _tmp10_ = NULL;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp10_ = e;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6243 "PiwigoPublishing.c"
+#line 6491 "PiwigoPublishing.c"
 							gchar* _tmp11_ = NULL;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (error_type);
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							error_type = _tmp11_;
-#line 6251 "PiwigoPublishing.c"
+#line 6499 "PiwigoPublishing.c"
 						} else {
 							GError* _tmp12_ = NULL;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp12_ = e;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6258 "PiwigoPublishing.c"
+#line 6506 "PiwigoPublishing.c"
 								gchar* _tmp13_ = NULL;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp13_ = g_strdup ("EXPIRED_SESSION");
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_g_free0 (error_type);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								error_type = _tmp13_;
-#line 6266 "PiwigoPublishing.c"
+#line 6514 "PiwigoPublishing.c"
 							} else {
 								GError* _tmp14_ = NULL;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp14_ = e;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6273 "PiwigoPublishing.c"
+#line 6521 "PiwigoPublishing.c"
 									gchar* _tmp15_ = NULL;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_g_free0 (error_type);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									error_type = _tmp15_;
-#line 6281 "PiwigoPublishing.c"
+#line 6529 "PiwigoPublishing.c"
 								}
 							}
 						}
@@ -6295,27 +6544,27 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 			}
 		}
 	}
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = error_type;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = e;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = _tmp17_->message;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp16_, _tmp18_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = _tmp19_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:919: %s", _tmp20_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:947: %s", _tmp20_);
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp20_);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = _ ("An error message occurred when publishing to Piwigo. Please try again.");
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error_message (self, _tmp21_);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (error_type);
-#line 6310 "PiwigoPublishing.c"
+#line 6558 "PiwigoPublishing.c"
 }
 
 
@@ -6325,19 +6574,19 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (message != NULL);
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:927: ACTION: do_show_error_message");
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:955: ACTION: do_show_error_message");
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = message;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6332 "PiwigoPublishing.c"
+#line 6580 "PiwigoPublishing.c"
 }
 
 
@@ -6351,39 +6600,39 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
      * @return the value of pwg_id if present or null if not found
      */
 static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6348 "PiwigoPublishing.c"
+#line 6596 "PiwigoPublishing.c"
 }
 
 
 static gpointer __vala_SoupCookie_copy0 (gpointer self) {
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6355 "PiwigoPublishing.c"
+#line 6603 "PiwigoPublishing.c"
 }
 
 
 static void _vala_SoupCookie_free (SoupCookie* self) {
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_cookie_get_type (), self);
-#line 6362 "PiwigoPublishing.c"
+#line 6610 "PiwigoPublishing.c"
 }
 
 
 static void __vala_SoupCookie_free0_ (gpointer var) {
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6369 "PiwigoPublishing.c"
+#line 6617 "PiwigoPublishing.c"
 }
 
 
 static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_slist_free (self);
-#line 6378 "PiwigoPublishing.c"
+#line 6626 "PiwigoPublishing.c"
 }
 
 
@@ -6395,84 +6644,84 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 	SoupMessage* _tmp2_ = NULL;
 	GSList* _tmp3_ = NULL;
 	GSList* _tmp4_ = NULL;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	pwg_id = NULL;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_message (_tmp0_);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = soup_cookies_from_response (_tmp2_);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 6408 "PiwigoPublishing.c"
+#line 6656 "PiwigoPublishing.c"
 	{
 		GSList* cookie_collection = NULL;
 		GSList* cookie_it = NULL;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cookie_collection = _tmp4_;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6416 "PiwigoPublishing.c"
+#line 6664 "PiwigoPublishing.c"
 			SoupCookie* _tmp5_ = NULL;
 			SoupCookie* cookie = NULL;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			cookie = _tmp5_;
-#line 6423 "PiwigoPublishing.c"
+#line 6671 "PiwigoPublishing.c"
 			{
 				SoupCookie* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = cookie;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = soup_cookie_get_name (_tmp6_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6433 "PiwigoPublishing.c"
+#line 6681 "PiwigoPublishing.c"
 					SoupCookie* _tmp8_ = NULL;
 					const gchar* _tmp9_ = NULL;
 					gchar* _tmp10_ = NULL;
 					const gchar* _tmp11_ = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = cookie;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = soup_cookie_get_value (_tmp8_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp10_ = g_strdup (_tmp9_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (pwg_id);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					pwg_id = _tmp10_;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp11_ = pwg_id;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					g_debug ("PiwigoPublishing.vala:951: Found pwg_id %s", _tmp11_);
-#line 6452 "PiwigoPublishing.c"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					g_debug ("PiwigoPublishing.vala:979: Found pwg_id %s", _tmp11_);
+#line 6700 "PiwigoPublishing.c"
 				}
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				__vala_SoupCookie_free0 (cookie);
-#line 6456 "PiwigoPublishing.c"
+#line 6704 "PiwigoPublishing.c"
 			}
 		}
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6461 "PiwigoPublishing.c"
+#line 6709 "PiwigoPublishing.c"
 	}
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = pwg_id;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6467 "PiwigoPublishing.c"
+#line 6715 "PiwigoPublishing.c"
 }
 
 
@@ -6483,7 +6732,7 @@ static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwig
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6478 "PiwigoPublishing.c"
+#line 6726 "PiwigoPublishing.c"
 }
 
 
@@ -6498,7 +6747,7 @@ static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_start;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6493 "PiwigoPublishing.c"
+#line 6741 "PiwigoPublishing.c"
 }
 
 
@@ -6519,7 +6768,7 @@ static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPi
 	self->priv->parameters = NULL;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 6514 "PiwigoPublishing.c"
+#line 6762 "PiwigoPublishing.c"
 }
 
 
@@ -6547,7 +6796,7 @@ static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) {
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6542 "PiwigoPublishing.c"
+#line 6790 "PiwigoPublishing.c"
 }
 
 
@@ -6572,36 +6821,36 @@ PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_typ
 	gint _tmp1__length1 = 0;
 	PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
 	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishables;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = parameters;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp2_);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6589 "PiwigoPublishing.c"
+#line 6837 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6596 "PiwigoPublishing.c"
+#line 6844 "PiwigoPublishing.c"
 }
 
 
@@ -6614,61 +6863,61 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
 	SpitPublishingPublishable* _tmp3_ = NULL;
 	PublishingPiwigoImagesAddTransaction* _tmp4_ = NULL;
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishable;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, _tmp3_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp5_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6631 "PiwigoPublishing.c"
+#line 6879 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_piwigo_uploader_finalize;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_piwigo_uploader_real_create_transaction;
-#line 6644 "PiwigoPublishing.c"
+#line 6892 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6651 "PiwigoPublishing.c"
+#line 6899 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingPiwigoUploader * self;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6663 "PiwigoPublishing.c"
+#line 6911 "PiwigoPublishing.c"
 }
 
 
@@ -6684,6 +6933,508 @@ GType publishing_piwigo_uploader_get_type (void) {
 }
 
 
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return _data1_;
+#line 6932 "PiwigoPublishing.c"
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 6941 "PiwigoPublishing.c"
+		PublishingPiwigoSSLErrorPane* self;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		self = _data1_->self;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (_data1_->cert);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (self);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 6951 "PiwigoPublishing.c"
+	}
+}
+
+
+static void ___lambda4_ (Block1Data* _data1_) {
+	PublishingPiwigoSSLErrorPane* self;
+	GcrSimpleCertificate* simple_cert = NULL;
+	GTlsCertificate* _tmp0_ = NULL;
+	GByteArray* _tmp1_ = NULL;
+	GByteArray* _tmp2_ = NULL;
+	GByteArray* _tmp3_ = NULL;
+	guint8* _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	GcrSimpleCertificate* _tmp5_ = NULL;
+	GcrSimpleCertificate* _tmp6_ = NULL;
+	GcrCertificateWidget* widget = NULL;
+	GcrCertificateWidget* _tmp7_ = NULL;
+	GtkDialog* dialog = NULL;
+	GtkDialog* _tmp8_ = NULL;
+	GtkBox* _tmp9_ = NULL;
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = _data1_->self;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = _data1_->cert;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_get (_tmp0_, "certificate", &_tmp1_, NULL);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = _tmp1_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = _tmp3_->data;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4__length1 = (gint) _tmp3_->len;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = (GcrSimpleCertificate*) gcr_simple_certificate_new (_tmp4_, _tmp4__length1);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = _tmp5_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_byte_array_unref0 (_tmp3_);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	simple_cert = _tmp6_;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = gcr_certificate_widget_new (G_TYPE_CHECK_INSTANCE_CAST (simple_cert, gcr_certificate_get_type (), GcrCertificate));
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_ref_sink (_tmp7_);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	widget = _tmp7_;
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = (GtkDialog*) gtk_dialog_new ();
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_ref_sink (_tmp8_);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	dialog = _tmp8_;
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp9_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (widget, gtk_widget_get_type (), GtkWidget));
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_dialog_add_button (dialog, "_OK", (gint) GTK_RESPONSE_OK);
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), 640, -1);
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_dialog_run (dialog);
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (dialog);
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (widget);
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (simple_cert);
+#line 7028 "PiwigoPublishing.c"
+}
+
+
+static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	___lambda4_ (self);
+#line 7035 "PiwigoPublishing.c"
+}
+
+
+static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_emit_by_name (self, "proceed");
+#line 7042 "PiwigoPublishing.c"
+}
+
+
+static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	___lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
+#line 7049 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+	PublishingPiwigoSSLErrorPane * self = NULL;
+	GError * _inner_error_ = NULL;
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (host != NULL, NULL);
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, NULL);
+#line 7062 "PiwigoPublishing.c"
+	{
+		Block1Data* _data1_;
+		GtkBuilder* _tmp0_ = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		GtkBuilder* _tmp2_ = NULL;
+		GObject* _tmp3_ = NULL;
+		GtkWidget* _tmp4_ = NULL;
+		GtkLabel* label = NULL;
+		GtkBuilder* _tmp5_ = NULL;
+		GObject* _tmp6_ = NULL;
+		GtkLabel* _tmp7_ = NULL;
+		GtkLabel* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		GtkLabel* _tmp13_ = NULL;
+		GtkBuilder* _tmp14_ = NULL;
+		GObject* _tmp15_ = NULL;
+		GtkLabel* _tmp16_ = NULL;
+		gchar* text = NULL;
+		PublishingPiwigoSessionLoginTransaction* _tmp17_ = NULL;
+		GTlsCertificate* _tmp18_ = NULL;
+		gchar* _tmp19_ = NULL;
+		GtkLabel* _tmp20_ = NULL;
+		const gchar* _tmp21_ = NULL;
+		GtkButton* info = NULL;
+		GtkBuilder* _tmp22_ = NULL;
+		GObject* _tmp23_ = NULL;
+		GtkButton* _tmp24_ = NULL;
+		GtkButton* _tmp25_ = NULL;
+		GtkButton* proceed = NULL;
+		GtkBuilder* _tmp26_ = NULL;
+		GObject* _tmp27_ = NULL;
+		GtkButton* _tmp28_ = NULL;
+		GtkButton* _tmp29_ = NULL;
+		GtkWidget* _tmp30_ = NULL;
+		GtkContainer* _tmp31_ = NULL;
+		GtkContainer* _tmp32_ = NULL;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_data1_ = g_slice_new0 (Block1Data);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_data1_->_ref_count_ = 1;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_data1_->self = g_object_ref (self);
+#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = gtk_builder_new ();
+#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (self->priv->builder);
+#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		self->priv->builder = _tmp0_;
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp1_ = self->priv->builder;
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", &_inner_error_);
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			block1_data_unref (_data1_);
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_data1_ = NULL;
+#line 7124 "PiwigoPublishing.c"
+			goto __catch44_g_error;
+		}
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp2_ = self->priv->builder;
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp3_ = gtk_builder_get_object (_tmp2_, "content");
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp3_) : NULL);
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (self->priv->content);
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		self->priv->content = _tmp4_;
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp5_ = self->priv->builder;
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp6_ = gtk_builder_get_object (_tmp5_, "main_text");
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL);
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		label = _tmp7_;
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp8_ = label;
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp9_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
+"to steal or alter information going to or from this site (for example," \
+" private messages, credit card information, or passwords).");
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp10_ = host;
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp11_ = g_strdup_printf (_tmp9_, _tmp10_);
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp12_ = _tmp11_;
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_label_set_text (_tmp8_, _tmp12_);
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (_tmp12_);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp13_ = label;
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_label_set_use_markup (_tmp13_, TRUE);
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp14_ = self->priv->builder;
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (label);
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		label = _tmp16_;
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp17_ = transaction;
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp19_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp18_);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (_data1_->cert);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_data1_->cert = _tmp18_;
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		text = _tmp19_;
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp20_ = label;
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp21_ = text;
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_label_set_text (_tmp20_, _tmp21_);
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp22_ = self->priv->builder;
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		info = _tmp24_;
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp25_ = info;
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_signal_connect_data (_tmp25_, "clicked", (GCallback) ____lambda4__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp26_ = self->priv->builder;
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp27_ = gtk_builder_get_object (_tmp26_, "proceed_button");
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_button_get_type ()) ? ((GtkButton*) _tmp27_) : NULL);
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		proceed = _tmp28_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp29_ = proceed;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_signal_connect_object (_tmp29_, "clicked", (GCallback) ____lambda5__gtk_button_clicked, self, 0);
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp30_ = self->priv->content;
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp31_ = gtk_widget_get_parent (_tmp30_);
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp32_ = _tmp31_;
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		if (_tmp32_ != NULL) {
+#line 7221 "PiwigoPublishing.c"
+			GtkWidget* _tmp33_ = NULL;
+			GtkContainer* _tmp34_ = NULL;
+			GtkContainer* _tmp35_ = NULL;
+			GtkWidget* _tmp36_ = NULL;
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp33_ = self->priv->content;
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp34_ = gtk_widget_get_parent (_tmp33_);
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp35_ = _tmp34_;
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp36_ = self->priv->content;
+#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_container_remove (_tmp35_, _tmp36_);
+#line 7236 "PiwigoPublishing.c"
+		}
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (proceed);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (info);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (text);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (label);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		block1_data_unref (_data1_);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_data1_ = NULL;
+#line 7250 "PiwigoPublishing.c"
+	}
+	goto __finally44;
+	__catch44_g_error:
+	{
+		GError* _error_ = NULL;
+		const gchar* _tmp37_ = NULL;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_error_ = _inner_error_;
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_inner_error_ = NULL;
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp37_ = _error_->message;
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_warning ("PiwigoPublishing.vala:1053: Failed to create ui file: %s", _tmp37_);
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_assert_not_reached ();
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_error_free0 (_error_);
+#line 7269 "PiwigoPublishing.c"
+	}
+	__finally44:
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		return NULL;
+#line 7280 "PiwigoPublishing.c"
+	}
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self;
+#line 7284 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
+#line 7291 "PiwigoPublishing.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+	PublishingPiwigoSSLErrorPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 7304 "PiwigoPublishing.c"
+}
+
+
+static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	PublishingPiwigoSSLErrorPane * self;
+	GtkWidget* result = NULL;
+	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->content;
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp1_;
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 7323 "PiwigoPublishing.c"
+}
+
+
+GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self) {
+	GtkWidget* result = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
+	GtkWidget* _tmp2_ = NULL;
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->builder;
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = gtk_builder_get_object (_tmp0_, "default");
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp1_) : NULL);
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp2_;
+#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 7344 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+	PublishingPiwigoSSLErrorPane * self;
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 7352 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+	PublishingPiwigoSSLErrorPane * self;
+#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 7360 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass) {
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_piwigo_ssl_error_pane_parent_class = g_type_class_peek_parent (klass);
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate));
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 7373 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_preferred_geometry;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_widget;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_installed;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled;
+#line 7388 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
+#line 7395 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) {
+	PublishingPiwigoSSLErrorPane * self;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->content);
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
+#line 7409 "PiwigoPublishing.c"
+}
+
+
+GType publishing_piwigo_ssl_error_pane_get_type (void) {
+	static volatile gsize publishing_piwigo_ssl_error_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_piwigo_ssl_error_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSSLErrorPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_ssl_error_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSSLErrorPane), 0, (GInstanceInitFunc) publishing_piwigo_ssl_error_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_piwigo_ssl_error_pane_type_id;
+		publishing_piwigo_ssl_error_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoSSLErrorPane", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_piwigo_ssl_error_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&publishing_piwigo_ssl_error_pane_type_id__volatile, publishing_piwigo_ssl_error_pane_type_id);
+	}
+	return publishing_piwigo_ssl_error_pane_type_id__volatile;
+}
+
+
 GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 	static volatile gsize publishing_piwigo_authentication_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_authentication_pane_mode_type_id__volatile)) {
@@ -6697,30 +7448,30 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 
 
 static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 6694 "PiwigoPublishing.c"
+#line 7442 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 6701 "PiwigoPublishing.c"
+#line 7449 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 6708 "PiwigoPublishing.c"
+#line 7456 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 6715 "PiwigoPublishing.c"
+#line 7463 "PiwigoPublishing.c"
 }
 
 
@@ -6728,19 +7479,19 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_constr
 	PublishingPiwigoAuthenticationPane * self = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, NULL);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 6735 "PiwigoPublishing.c"
+#line 7483 "PiwigoPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 		GtkBuilder* _tmp2_ = NULL;
@@ -6794,328 +7545,328 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_constr
 		SpitPublishingPluginHost* _tmp63_ = NULL;
 		SpitPublishingPluginHost* _tmp64_ = NULL;
 		GtkButton* _tmp65_ = NULL;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = gtk_builder_new ();
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->builder);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->builder = _tmp1_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = self->priv->builder;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", &_inner_error_);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6801 "PiwigoPublishing.c"
-			goto __catch44_g_error;
+#line 7549 "PiwigoPublishing.c"
+			goto __catch45_g_error;
 		}
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = self->priv->builder;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_builder_connect_signals (_tmp3_, NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->builder;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = gtk_builder_get_object (_tmp4_, "alignment");
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		align = _tmp6_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = self->priv->builder;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		message_label = _tmp9_;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = mode;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		switch (_tmp10_) {
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 6830 "PiwigoPublishing.c"
+#line 7578 "PiwigoPublishing.c"
 			{
 				GtkLabel* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp11_ = message_label;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp12_ = publishing_piwigo_authentication_pane_INTRO_MESSAGE;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_label_set_text (_tmp11_, _tmp12_);
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 6842 "PiwigoPublishing.c"
+#line 7590 "PiwigoPublishing.c"
 			}
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 6846 "PiwigoPublishing.c"
+#line 7594 "PiwigoPublishing.c"
 			{
 				GtkLabel* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp13_ = message_label;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp14_ = _ ("Invalid URL");
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp15_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp17_ = _tmp16_;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_label_set_markup (_tmp13_, _tmp17_);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp17_);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 6869 "PiwigoPublishing.c"
+#line 7617 "PiwigoPublishing.c"
 			}
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 6873 "PiwigoPublishing.c"
+#line 7621 "PiwigoPublishing.c"
 			{
 				GtkLabel* _tmp18_ = NULL;
 				const gchar* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				gchar* _tmp21_ = NULL;
 				gchar* _tmp22_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = message_label;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp19_ = _ ("Invalid User Name or Password");
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp20_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp21_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp19_, _tmp20_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp22_ = _tmp21_;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_label_set_markup (_tmp18_, _tmp22_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp22_);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 6896 "PiwigoPublishing.c"
+#line 7644 "PiwigoPublishing.c"
 			}
 			default:
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 6901 "PiwigoPublishing.c"
+#line 7649 "PiwigoPublishing.c"
 		}
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = self->priv->builder;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp24_ = gtk_builder_get_object (_tmp23_, "url_entry");
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->url_entry);
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->url_entry = _tmp25_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp26_ = publisher;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp27_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp26_);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_url = _tmp27_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp28_ = persistent_url;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp28_ != NULL) {
-#line 6923 "PiwigoPublishing.c"
+#line 7671 "PiwigoPublishing.c"
 			GtkEntry* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp29_ = self->priv->url_entry;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp30_ = persistent_url;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			gtk_entry_set_text (_tmp29_, _tmp30_);
-#line 6932 "PiwigoPublishing.c"
+#line 7680 "PiwigoPublishing.c"
 		}
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp31_ = self->priv->builder;
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp32_ = gtk_builder_get_object (_tmp31_, "username_entry");
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->username_entry);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->username_entry = _tmp33_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp34_ = publisher;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp35_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp34_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_username = _tmp35_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = persistent_username;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp36_ != NULL) {
-#line 6954 "PiwigoPublishing.c"
+#line 7702 "PiwigoPublishing.c"
 			GtkEntry* _tmp37_ = NULL;
 			const gchar* _tmp38_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp37_ = self->priv->username_entry;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp38_ = persistent_username;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			gtk_entry_set_text (_tmp37_, _tmp38_);
-#line 6963 "PiwigoPublishing.c"
+#line 7711 "PiwigoPublishing.c"
 		}
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp39_ = self->priv->builder;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp40_ = gtk_builder_get_object (_tmp39_, "password_entry");
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp40_) : NULL);
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->password_entry);
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->password_entry = _tmp41_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp42_ = publisher;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp43_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp42_);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_password = _tmp43_;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp44_ = persistent_password;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp44_ != NULL) {
-#line 6985 "PiwigoPublishing.c"
+#line 7733 "PiwigoPublishing.c"
 			GtkEntry* _tmp45_ = NULL;
 			const gchar* _tmp46_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp45_ = self->priv->password_entry;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = persistent_password;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			gtk_entry_set_text (_tmp45_, _tmp46_);
-#line 6994 "PiwigoPublishing.c"
+#line 7742 "PiwigoPublishing.c"
 		}
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp47_ = self->priv->builder;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48_ = gtk_builder_get_object (_tmp47_, "remember_password_checkbutton");
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp48_) : NULL);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->remember_password_checkbutton);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->remember_password_checkbutton = _tmp49_;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp50_ = self->priv->remember_password_checkbutton;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp51_ = publisher;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp52_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp51_);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp53_ = self->priv->builder;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp54_ = gtk_builder_get_object (_tmp53_, "login_button");
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp55_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp54_, gtk_button_get_type ()) ? ((GtkButton*) _tmp54_) : NULL);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->login_button);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->login_button = _tmp55_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp56_ = self->priv->username_entry;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp57_ = self->priv->url_entry;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp58_ = self->priv->password_entry;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp59_ = self->priv->login_button;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp60_ = align;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp61_ = self->priv->pane_widget;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp62_ = publisher;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp63_ = publishing_piwigo_piwigo_publisher_get_host (_tmp62_);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp64_ = _tmp63_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp65_ = self->priv->login_button;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		spit_publishing_plugin_host_set_dialog_default_widget (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_tmp64_);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_password);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_username);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_url);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (message_label);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (align);
-#line 7068 "PiwigoPublishing.c"
+#line 7816 "PiwigoPublishing.c"
 	}
-	goto __finally44;
-	__catch44_g_error:
+	goto __finally45;
+	__catch45_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp66_ = NULL;
 		const gchar* _tmp67_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		e = _inner_error_;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp66_ = e;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp67_ = _tmp66_->message;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_warning ("PiwigoPublishing.vala:1059: Could not load UI: %s", _tmp67_);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_warning ("PiwigoPublishing.vala:1154: Could not load UI: %s", _tmp67_);
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (e);
-#line 7088 "PiwigoPublishing.c"
+#line 7836 "PiwigoPublishing.c"
 	}
-	__finally44:
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally45:
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 7099 "PiwigoPublishing.c"
+#line 7847 "PiwigoPublishing.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 7103 "PiwigoPublishing.c"
+#line 7851 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7110 "PiwigoPublishing.c"
+#line 7858 "PiwigoPublishing.c"
 }
 
 
@@ -7123,17 +7874,17 @@ GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingP
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->login_button;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7128 "PiwigoPublishing.c"
+#line 7876 "PiwigoPublishing.c"
 }
 
 
@@ -7146,54 +7897,54 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
 	const gchar* _tmp5_ = NULL;
 	GtkCheckButton* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->url_entry;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->username_entry;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->remember_password_checkbutton;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7161 "PiwigoPublishing.c"
+#line 7909 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7170 "PiwigoPublishing.c"
+#line 7918 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7179 "PiwigoPublishing.c"
+#line 7927 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7188 "PiwigoPublishing.c"
+#line 7936 "PiwigoPublishing.c"
 }
 
 
@@ -7204,59 +7955,59 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 	guint _tmp3_ = 0U;
 	guint _tmp4_ = 0U;
 	GtkButton* _tmp11_ = NULL;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->url_entry;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = gtk_entry_get_text_length (_tmp2_);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ != ((guint) 0)) {
-#line 7209 "PiwigoPublishing.c"
+#line 7957 "PiwigoPublishing.c"
 		GtkEntry* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		guint _tmp7_ = 0U;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = self->priv->username_entry;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = gtk_entry_get_text_length (_tmp5_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7221 "PiwigoPublishing.c"
+#line 7969 "PiwigoPublishing.c"
 	} else {
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 7225 "PiwigoPublishing.c"
+#line 7973 "PiwigoPublishing.c"
 	}
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 7229 "PiwigoPublishing.c"
+#line 7977 "PiwigoPublishing.c"
 		GtkEntry* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		guint _tmp10_ = 0U;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->password_entry;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = gtk_entry_get_text_length (_tmp8_);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7241 "PiwigoPublishing.c"
+#line 7989 "PiwigoPublishing.c"
 	} else {
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7245 "PiwigoPublishing.c"
+#line 7993 "PiwigoPublishing.c"
 	}
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->login_button;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7251 "PiwigoPublishing.c"
+#line 7999 "PiwigoPublishing.c"
 }
 
 
@@ -7265,30 +8016,30 @@ static GtkWidget* publishing_piwigo_authentication_pane_real_get_widget (SpitPub
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7270 "PiwigoPublishing.c"
+#line 8018 "PiwigoPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingPiwigoAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7283 "PiwigoPublishing.c"
+#line 8031 "PiwigoPublishing.c"
 }
 
 
@@ -7297,31 +8048,31 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (SpitPu
 	GtkEntry* _tmp0_ = NULL;
 	GtkEntry* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->url_entry;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->password_entry;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_entry_set_activates_default (_tmp1_, TRUE);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->login_button;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7308 "PiwigoPublishing.c"
+#line 8056 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingPiwigoAuthenticationPane * self;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 7316 "PiwigoPublishing.c"
+#line 8064 "PiwigoPublishing.c"
 }
 
 
@@ -7332,27 +8083,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = closure->data;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7335 "PiwigoPublishing.c"
+#line 8083 "PiwigoPublishing.c"
 	} else {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 7341 "PiwigoPublishing.c"
+#line 8089 "PiwigoPublishing.c"
 	}
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 7347 "PiwigoPublishing.c"
+#line 8095 "PiwigoPublishing.c"
 }
 
 
@@ -7363,83 +8114,83 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate));
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = _ ("Enter the URL of your Piwigo photo library as well as the username and" \
 " password associated with your Piwigo account for that library.");
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp1_;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \
 "RL you entered");
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp3_;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _ ("Username and/or password invalid. Please try again");
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp5_;
-#line 7384 "PiwigoPublishing.c"
+#line 8132 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_widget;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_preferred_geometry;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_uninstalled;
-#line 7399 "PiwigoPublishing.c"
+#line 8147 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 7408 "PiwigoPublishing.c"
+#line 8156 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_finalize (GObject* obj) {
 	PublishingPiwigoAuthenticationPane * self;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->url_entry);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->remember_password_checkbutton);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->login_button);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 7432 "PiwigoPublishing.c"
+#line 8180 "PiwigoPublishing.c"
 }
 
 
@@ -7462,72 +8213,72 @@ GType publishing_piwigo_authentication_pane_get_type (void) {
 
 
 static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7457 "PiwigoPublishing.c"
+#line 8205 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7464 "PiwigoPublishing.c"
+#line 8212 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7471 "PiwigoPublishing.c"
+#line 8219 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7478 "PiwigoPublishing.c"
+#line 8226 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7485 "PiwigoPublishing.c"
+#line 8233 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 7492 "PiwigoPublishing.c"
+#line 8240 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 7499 "PiwigoPublishing.c"
+#line 8247 "PiwigoPublishing.c"
 }
 
 
 static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
 	PublishingPiwigoCategory** result;
 	int i;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = g_new0 (PublishingPiwigoCategory*, length + 1);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7510 "PiwigoPublishing.c"
+#line 8258 "PiwigoPublishing.c"
 		PublishingPiwigoCategory* _tmp0_ = NULL;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 7516 "PiwigoPublishing.c"
+#line 8264 "PiwigoPublishing.c"
 	}
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7520 "PiwigoPublishing.c"
+#line 8268 "PiwigoPublishing.c"
 }
 
 
@@ -7554,39 +8305,39 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane
 	gchar* _tmp88_ = NULL;
 	gchar* _tmp89_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = last_category;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->last_category = _tmp1_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = last_permission_level;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->last_permission_level = _tmp2_;
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = last_photo_size;
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->last_photo_size = _tmp3_;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = last_title_as_comment;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->last_title_as_comment = _tmp4_;
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = last_no_upload_tags;
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->last_no_upload_tags = _tmp5_;
-#line 7579 "PiwigoPublishing.c"
+#line 8327 "PiwigoPublishing.c"
 	{
 		GtkBuilder* _tmp6_ = NULL;
 		GtkBuilder* _tmp7_ = NULL;
@@ -7659,344 +8410,344 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane
 		GtkBox* _tmp73_ = NULL;
 		GtkBox* _tmp74_ = NULL;
 		GtkAlignment* _tmp75_ = NULL;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = gtk_builder_new ();
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->builder);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->builder = _tmp6_;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = self->priv->builder;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_builder_add_from_resource (_tmp7_, PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", &_inner_error_);
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7664 "PiwigoPublishing.c"
-			goto __catch45_g_error;
+#line 8412 "PiwigoPublishing.c"
+			goto __catch46_g_error;
 		}
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->builder;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_builder_connect_signals (_tmp8_, NULL);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->builder;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = gtk_builder_get_object (_tmp9_, "alignment");
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp10_) : NULL);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		align = _tmp11_;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = self->priv->builder;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = gtk_builder_get_object (_tmp12_, "use_existing_radio");
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp13_) : NULL);
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->use_existing_radio);
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->use_existing_radio = _tmp14_;
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = self->priv->builder;
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = gtk_builder_get_object (_tmp15_, "create_new_radio");
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->create_new_radio);
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->create_new_radio = _tmp17_;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = self->priv->builder;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = gtk_builder_get_object (_tmp18_, "existing_categories_combo");
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp19_) : NULL);
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->existing_categories_combo);
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->existing_categories_combo = _tmp20_;
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = self->priv->builder;
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = gtk_builder_get_object (_tmp21_, "new_category_entry");
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL);
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->new_category_entry);
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->new_category_entry = _tmp23_;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp24_ = self->priv->builder;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = gtk_builder_get_object (_tmp24_, "within_existing_label");
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp25_) : NULL);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->within_existing_label);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->within_existing_label = _tmp26_;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp27_ = self->priv->builder;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp28_ = gtk_builder_get_object (_tmp27_, "within_existing_combo");
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp28_) : NULL);
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->within_existing_combo);
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->within_existing_combo = _tmp29_;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp30_ = self->priv->builder;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp31_ = gtk_builder_get_object (_tmp30_, "album_comment");
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp31_) : NULL);
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->album_comment);
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->album_comment = _tmp32_;
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp33_ = self->priv->album_comment;
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp34_ = gtk_text_buffer_new (NULL);
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp35_ = _tmp34_;
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_text_view_set_buffer (_tmp33_, _tmp35_);
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_tmp35_);
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = self->priv->builder;
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp37_ = gtk_builder_get_object (_tmp36_, "album_comment_label");
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp37_) : NULL);
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->album_comment_label);
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->album_comment_label = _tmp38_;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp39_ = self->priv->builder;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp40_ = gtk_builder_get_object (_tmp39_, "perms_combo");
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp40_) : NULL);
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->perms_combo);
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->perms_combo = _tmp41_;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp42_ = self->priv->builder;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp43_ = gtk_builder_get_object (_tmp42_, "size_combo");
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp43_) : NULL);
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->size_combo);
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->size_combo = _tmp44_;
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp45_ = self->priv->builder;
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp46_ = gtk_builder_get_object (_tmp45_, "strip_metadata_check");
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp46_) : NULL);
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->strip_metadata_check = _tmp47_;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48_ = self->priv->strip_metadata_check;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp49_ = strip_metadata_enabled;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp50_ = self->priv->builder;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp51_ = gtk_builder_get_object (_tmp50_, "title_as_comment_check");
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp52_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp51_) : NULL);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->title_as_comment_check);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->title_as_comment_check = _tmp52_;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp53_ = self->priv->title_as_comment_check;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp54_ = last_title_as_comment;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp54_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp55_ = self->priv->builder;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp56_ = gtk_builder_get_object (_tmp55_, "no_upload_tags_check");
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp56_) : NULL);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->no_upload_tags_check = _tmp57_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp58_ = self->priv->no_upload_tags_check;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp59_ = last_no_upload_tags;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp59_);
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp60_ = self->priv->builder;
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp61_ = gtk_builder_get_object (_tmp60_, "logout_button");
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, gtk_button_get_type ()) ? ((GtkButton*) _tmp61_) : NULL);
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
-#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->logout_button = _tmp62_;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp63_ = self->priv->logout_button;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp64_ = self->priv->builder;
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp65_ = gtk_builder_get_object (_tmp64_, "publish_button");
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, gtk_button_get_type ()) ? ((GtkButton*) _tmp65_) : NULL);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->publish_button = _tmp66_;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp67_ = self->priv->publish_button;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp68_ = self->priv->use_existing_radio;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp69_ = self->priv->create_new_radio;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp70_ = self->priv->new_category_entry;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp71_ = self->priv->within_existing_combo;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed, self, 0);
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp72_ = align;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp73_ = self->priv->pane_widget;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget));
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp74_ = self->priv->pane_widget;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp75_ = align;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_box_set_child_packing (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (align);
-#line 7895 "PiwigoPublishing.c"
+#line 8643 "PiwigoPublishing.c"
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp76_ = NULL;
 		const gchar* _tmp77_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		e = _inner_error_;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp76_ = e;
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp77_ = _tmp76_->message;
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_warning ("PiwigoPublishing.vala:1202: Could not load UI: %s", _tmp77_);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_warning ("PiwigoPublishing.vala:1297: Could not load UI: %s", _tmp77_);
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (e);
-#line 7915 "PiwigoPublishing.c"
+#line 8663 "PiwigoPublishing.c"
 	}
-	__finally45:
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally46:
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 7926 "PiwigoPublishing.c"
+#line 8674 "PiwigoPublishing.c"
 	}
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp78_ = categories;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp78__length1 = categories_length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp79_ = (_tmp78_ != NULL) ? _vala_array_dup11 (_tmp78_, _tmp78__length1) : ((gpointer) _tmp78_);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp79__length1 = _tmp78__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->existing_categories = _tmp79_;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->existing_categories_length1 = _tmp79__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->_existing_categories_size_ = self->priv->existing_categories_length1;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp81_ = publishing_piwigo_publishing_options_pane_create_perm_levels (self, &_tmp80_);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->perm_levels = _tmp81_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->perm_levels_length1 = _tmp80_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->_perm_levels_size_ = self->priv->perm_levels_length1;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp83_ = publishing_piwigo_publishing_options_pane_create_sizes (self, &_tmp82_);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->photo_sizes = _tmp83_;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->photo_sizes_length1 = _tmp82_;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->_photo_sizes_size_ = self->priv->photo_sizes_length1;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp84_ = self->priv->album_comment;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp85_ = gtk_text_view_get_buffer (_tmp84_);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp86_ = _tmp85_;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp87_ = publisher;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp88_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (self, _tmp87_);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp89_ = _tmp88_;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_text_buffer_set_text (_tmp86_, _tmp89_, -1);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp89_);
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 7982 "PiwigoPublishing.c"
+#line 8730 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 7989 "PiwigoPublishing.c"
+#line 8737 "PiwigoPublishing.c"
 }
 
 
@@ -8004,102 +8755,102 @@ GtkWidget* publishing_piwigo_publishing_options_pane_get_default_widget (Publish
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->publish_button;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8007 "PiwigoPublishing.c"
+#line 8755 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8018 "PiwigoPublishing.c"
+#line 8766 "PiwigoPublishing.c"
 	}
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8024 "PiwigoPublishing.c"
+#line 8772 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8035 "PiwigoPublishing.c"
+#line 8783 "PiwigoPublishing.c"
 	}
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8041 "PiwigoPublishing.c"
+#line 8789 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8052 "PiwigoPublishing.c"
+#line 8800 "PiwigoPublishing.c"
 	}
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8058 "PiwigoPublishing.c"
+#line 8806 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8069 "PiwigoPublishing.c"
+#line 8817 "PiwigoPublishing.c"
 	}
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8075 "PiwigoPublishing.c"
+#line 8823 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8086 "PiwigoPublishing.c"
+#line 8834 "PiwigoPublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8092 "PiwigoPublishing.c"
+#line 8840 "PiwigoPublishing.c"
 }
 
 
@@ -8131,166 +8882,166 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 	PublishingPiwigoPermissionLevel* _tmp15_ = NULL;
 	PublishingPiwigoPermissionLevel** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPiwigoPermissionLevel*, 0 + 1);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = _tmp0_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result__length1 = 0;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _result_;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _ ("Everyone");
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _ ("Admins, Family, Friends, Contacts");
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _ ("Admins, Family, Friends");
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _ ("Admins, Family");
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _ ("Admins");
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8192 "PiwigoPublishing.c"
+#line 8940 "PiwigoPublishing.c"
 	}
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp16_;
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8198 "PiwigoPublishing.c"
+#line 8946 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8209 "PiwigoPublishing.c"
+#line 8957 "PiwigoPublishing.c"
 	}
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8215 "PiwigoPublishing.c"
+#line 8963 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8226 "PiwigoPublishing.c"
+#line 8974 "PiwigoPublishing.c"
 	}
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8232 "PiwigoPublishing.c"
+#line 8980 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8243 "PiwigoPublishing.c"
+#line 8991 "PiwigoPublishing.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8249 "PiwigoPublishing.c"
+#line 8997 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8260 "PiwigoPublishing.c"
+#line 9008 "PiwigoPublishing.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8266 "PiwigoPublishing.c"
+#line 9014 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8277 "PiwigoPublishing.c"
+#line 9025 "PiwigoPublishing.c"
 	}
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8283 "PiwigoPublishing.c"
+#line 9031 "PiwigoPublishing.c"
 }
 
 
@@ -8322,104 +9073,104 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 	PublishingPiwigoSizeEntry* _tmp15_ = NULL;
 	PublishingPiwigoSizeEntry** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPiwigoSizeEntry*, 0 + 1);
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = _tmp0_;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result__length1 = 0;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _result_;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _ ("500 x 375 pixels");
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = _ ("500 × 375 pixels");
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = _ ("1024 x 768 pixels");
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = _ ("1024 × 768 pixels");
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _ ("2048 x 1536 pixels");
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = _ ("2048 × 1536 pixels");
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _ ("4096 x 3072 pixels");
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp11_ = _ ("4096 × 3072 pixels");
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _ ("Original size");
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8383 "PiwigoPublishing.c"
+#line 9131 "PiwigoPublishing.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp16_;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8389 "PiwigoPublishing.c"
+#line 9137 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 8398 "PiwigoPublishing.c"
+#line 9146 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 8405 "PiwigoPublishing.c"
+#line 9153 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 8412 "PiwigoPublishing.c"
+#line 9160 "PiwigoPublishing.c"
 }
 
 
@@ -8451,71 +9202,71 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 	PublishingPiwigoPublishingParameters* _tmp53_ = NULL;
 	GtkCheckButton* _tmp54_ = NULL;
 	gboolean _tmp55_ = FALSE;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publishing_piwigo_publishing_parameters_new ();
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	params = _tmp0_;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = params;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->perm_levels;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2__length1 = self->priv->perm_levels_length1;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->perms_combo;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _tmp2_[_tmp4_];
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _publishing_piwigo_permission_level_ref0 (_tmp5_);
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_permission_level_unref0 (_tmp1_->perm_level);
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_->perm_level = _tmp6_;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = params;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = self->priv->photo_sizes;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8__length1 = self->priv->photo_sizes_length1;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = self->priv->size_combo;
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _tmp8_[_tmp10_];
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _publishing_piwigo_size_entry_ref0 (_tmp11_);
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (_tmp7_->photo_size);
-#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_->photo_size = _tmp12_;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = params;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = self->priv->title_as_comment_check;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_->title_as_comment = _tmp15_;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = params;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = self->priv->no_upload_tags_check;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_->no_upload_tags = _tmp18_;
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = self->priv->create_new_radio;
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp20_) {
-#line 8508 "PiwigoPublishing.c"
+#line 9256 "PiwigoPublishing.c"
 		gchar* uploadcomment = NULL;
 		GtkTextView* _tmp21_ = NULL;
 		GtkTextBuffer* _tmp22_ = NULL;
@@ -8529,57 +9280,57 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 		GtkComboBoxText* _tmp29_ = NULL;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = self->priv->album_comment;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = gtk_text_view_get_buffer (_tmp21_);
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_object_get (_tmp23_, "text", &_tmp24_, NULL);
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = _tmp24_;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp26_ = _tmp25_;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp27_ = string_strip (_tmp26_);
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp28_ = _tmp27_;
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp26_);
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		uploadcomment = _tmp28_;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp29_ = self->priv->within_existing_combo;
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		a = _tmp30_;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp31_ = a;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp31_ == 0) {
-#line 8552 "PiwigoPublishing.c"
+#line 9300 "PiwigoPublishing.c"
 			PublishingPiwigoPublishingParameters* _tmp32_ = NULL;
 			GtkEntry* _tmp33_ = NULL;
 			const gchar* _tmp34_ = NULL;
 			const gchar* _tmp35_ = NULL;
 			PublishingPiwigoCategory* _tmp36_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_ = params;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp33_ = self->priv->new_category_entry;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp34_ = gtk_entry_get_text (_tmp33_);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp35_ = uploadcomment;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp36_ = publishing_piwigo_category_new_local (_tmp34_, 0, _tmp35_);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (_tmp32_->category);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_->category = _tmp36_;
-#line 8572 "PiwigoPublishing.c"
+#line 9320 "PiwigoPublishing.c"
 		} else {
 			gint _tmp37_ = 0;
 			PublishingPiwigoPublishingParameters* _tmp38_ = NULL;
@@ -8592,39 +9343,39 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 			gint _tmp44_ = 0;
 			const gchar* _tmp45_ = NULL;
 			PublishingPiwigoCategory* _tmp46_ = NULL;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp37_ = a;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			a = _tmp37_ - 1;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp38_ = params;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp39_ = self->priv->new_category_entry;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = gtk_entry_get_text (_tmp39_);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp41_ = self->priv->existing_categories;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp41__length1 = self->priv->existing_categories_length1;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = a;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp43_ = _tmp41_[_tmp42_];
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = _tmp43_->id;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp45_ = uploadcomment;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = publishing_piwigo_category_new_local (_tmp40_, _tmp44_, _tmp45_);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (_tmp38_->category);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp38_->category = _tmp46_;
-#line 8613 "PiwigoPublishing.c"
+#line 9361 "PiwigoPublishing.c"
 		}
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uploadcomment);
-#line 8617 "PiwigoPublishing.c"
+#line 9365 "PiwigoPublishing.c"
 	} else {
 		PublishingPiwigoPublishingParameters* _tmp47_ = NULL;
 		PublishingPiwigoCategory** _tmp48_ = NULL;
@@ -8633,37 +9384,37 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 		gint _tmp50_ = 0;
 		PublishingPiwigoCategory* _tmp51_ = NULL;
 		PublishingPiwigoCategory* _tmp52_ = NULL;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp47_ = params;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48_ = self->priv->existing_categories;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp48__length1 = self->priv->existing_categories_length1;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp49_ = self->priv->existing_categories_combo;
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp50_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp51_ = _tmp48_[_tmp50_];
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp52_ = _publishing_piwigo_category_ref0 (_tmp51_);
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_piwigo_category_unref0 (_tmp47_->category);
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp47_->category = _tmp52_;
-#line 8644 "PiwigoPublishing.c"
+#line 9392 "PiwigoPublishing.c"
 	}
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp53_ = params;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp54_ = self->priv->strip_metadata_check;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp53_, _tmp55_);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 8656 "PiwigoPublishing.c"
+#line 9404 "PiwigoPublishing.c"
 }
 
 
@@ -8675,39 +9426,39 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
 	GtkComboBoxText* _tmp4_ = NULL;
 	GtkLabel* _tmp5_ = NULL;
 	GtkTextView* _tmp6_ = NULL;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->existing_categories_combo;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->new_category_entry;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->within_existing_label;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->within_existing_combo;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->existing_categories_combo;
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->album_comment_label;
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->album_comment;
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 8700 "PiwigoPublishing.c"
+#line 9448 "PiwigoPublishing.c"
 }
 
 
@@ -8719,57 +9470,57 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
 	GtkTextView* _tmp4_ = NULL;
 	GtkComboBoxText* _tmp5_ = NULL;
 	GtkEntry* _tmp6_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->new_category_entry;
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->within_existing_label;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->within_existing_combo;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->album_comment_label;
-#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->album_comment;
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->existing_categories_combo;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->new_category_entry;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 8744 "PiwigoPublishing.c"
+#line 9492 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 8753 "PiwigoPublishing.c"
+#line 9501 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 8762 "PiwigoPublishing.c"
+#line 9510 "PiwigoPublishing.c"
 }
 
 
@@ -8787,38 +9538,38 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 	GtkRadioButton* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
 	GtkButton* _tmp24_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->new_category_entry;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = string_strip (_tmp1_);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	category_name = _tmp2_;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->within_existing_combo;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	a = _tmp4_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = a;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_ <= 0) {
-#line 8800 "PiwigoPublishing.c"
+#line 9548 "PiwigoPublishing.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = category_name;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = g_strconcat ("/ ", _tmp6_, NULL);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		search_name = _tmp7_;
-#line 8811 "PiwigoPublishing.c"
+#line 9559 "PiwigoPublishing.c"
 	} else {
 		gint _tmp8_ = 0;
 		PublishingPiwigoCategory** _tmp9_ = NULL;
@@ -8830,80 +9581,80 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 		gchar* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = a;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		a = _tmp8_ - 1;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->existing_categories;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9__length1 = self->priv->existing_categories_length1;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = a;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _tmp9_[_tmp10_];
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = _tmp11_->display_name;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = g_strconcat (_tmp12_, "/ ", NULL);
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = _tmp13_;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = category_name;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		search_name = _tmp16_;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp14_);
-#line 8851 "PiwigoPublishing.c"
+#line 9599 "PiwigoPublishing.c"
 	}
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = self->priv->create_new_radio;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp19_) {
-#line 8859 "PiwigoPublishing.c"
+#line 9607 "PiwigoPublishing.c"
 		gboolean _tmp20_ = FALSE;
 		const gchar* _tmp21_ = NULL;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = category_name;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp21_, "") == 0) {
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp20_ = TRUE;
-#line 8868 "PiwigoPublishing.c"
+#line 9616 "PiwigoPublishing.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp22_ = search_name;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp23_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp22_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp20_ = _tmp23_;
-#line 8878 "PiwigoPublishing.c"
+#line 9626 "PiwigoPublishing.c"
 		}
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = _tmp20_;
-#line 8882 "PiwigoPublishing.c"
+#line 9630 "PiwigoPublishing.c"
 	} else {
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = FALSE;
-#line 8886 "PiwigoPublishing.c"
+#line 9634 "PiwigoPublishing.c"
 	}
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = self->priv->publish_button;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), !_tmp17_);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (search_name);
-#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (category_name);
-#line 8896 "PiwigoPublishing.c"
+#line 9644 "PiwigoPublishing.c"
 }
 
 
@@ -8912,53 +9663,53 @@ static GtkWidget* publishing_piwigo_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8915 "PiwigoPublishing.c"
+#line 9663 "PiwigoPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8928 "PiwigoPublishing.c"
+#line 9676 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
 	GtkButton* _tmp0_ = NULL;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_categories_combo (self);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_within_categories_combo (self);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_permissions_combo (self);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_size_combo (self);
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->publish_button;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 8951 "PiwigoPublishing.c"
+#line 9699 "PiwigoPublishing.c"
 }
 
 
@@ -8980,158 +9731,158 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 	SpitPublishingPublishable** _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
 	const gchar* _tmp19_ = NULL;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publisher;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_piwigo_piwigo_publisher_get_host (_tmp0_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = spit_publishing_plugin_host_get_publishables (_tmp2_, &_tmp3_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5__length1 = _tmp3_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = _tmp5_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables_length1 = _tmp5__length1;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = g_strdup ("");
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	common = _tmp6_;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	isfirst = TRUE;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishables;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = publishables_length1;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 9009 "PiwigoPublishing.c"
+#line 9757 "PiwigoPublishing.c"
 		SpitPublishingPublishable** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = publishables;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8__length1 = publishables_length1;
-#line 9016 "PiwigoPublishing.c"
+#line 9764 "PiwigoPublishing.c"
 		{
 			SpitPublishingPublishable** pub_collection = NULL;
 			gint pub_collection_length1 = 0;
 			gint _pub_collection_size_ = 0;
 			gint pub_it = 0;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			pub_collection = _tmp8_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			pub_collection_length1 = _tmp8__length1;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9028 "PiwigoPublishing.c"
+#line 9776 "PiwigoPublishing.c"
 				SpitPublishingPublishable* _tmp9_ = NULL;
 				SpitPublishingPublishable* pub = NULL;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				pub = _tmp9_;
-#line 9035 "PiwigoPublishing.c"
+#line 9783 "PiwigoPublishing.c"
 				{
 					gchar* cur = NULL;
 					SpitPublishingPublishable* _tmp10_ = NULL;
 					gchar* _tmp11_ = NULL;
 					const gchar* _tmp12_ = NULL;
 					gboolean _tmp13_ = FALSE;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp10_ = pub;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp11_ = spit_publishing_publishable_get_param_string (_tmp10_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					cur = _tmp11_;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp12_ = cur;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_tmp12_ == NULL) {
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (cur);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_object_unref0 (pub);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						continue;
-#line 9058 "PiwigoPublishing.c"
+#line 9806 "PiwigoPublishing.c"
 					}
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp13_ = isfirst;
-#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_tmp13_) {
-#line 9064 "PiwigoPublishing.c"
+#line 9812 "PiwigoPublishing.c"
 						const gchar* _tmp14_ = NULL;
 						gchar* _tmp15_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp14_ = cur;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp15_ = g_strdup (_tmp14_);
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (common);
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						common = _tmp15_;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						isfirst = FALSE;
-#line 9077 "PiwigoPublishing.c"
+#line 9825 "PiwigoPublishing.c"
 					} else {
 						const gchar* _tmp16_ = NULL;
 						const gchar* _tmp17_ = NULL;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp16_ = cur;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp17_ = common;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9087 "PiwigoPublishing.c"
+#line 9835 "PiwigoPublishing.c"
 							gchar* _tmp18_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp18_ = g_strdup ("");
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (common);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							common = _tmp18_;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (cur);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_object_unref0 (pub);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							break;
-#line 9101 "PiwigoPublishing.c"
+#line 9849 "PiwigoPublishing.c"
 						}
 					}
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (cur);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (pub);
-#line 9108 "PiwigoPublishing.c"
+#line 9856 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = common;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:1362: PiwigoConnector: found common event commen" \
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:1457: PiwigoConnector: found common event commen" \
 "t %s\n", _tmp19_);
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = common;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9123 "PiwigoPublishing.c"
+#line 9871 "PiwigoPublishing.c"
 }
 
 
@@ -9142,88 +9893,88 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 	gint _tmp5__length1 = 0;
 	const gchar* _tmp21_ = NULL;
 	gboolean _tmp22_ = FALSE;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->existing_categories;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->existing_categories_length1;
-#line 9140 "PiwigoPublishing.c"
+#line 9888 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoCategory** cat_collection = NULL;
 		gint cat_collection_length1 = 0;
 		gint _cat_collection_size_ = 0;
 		gint cat_it = 0;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cat_collection = _tmp0_;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cat_collection_length1 = _tmp0__length1;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cat_it = 0; cat_it < _tmp0__length1; cat_it = cat_it + 1) {
-#line 9152 "PiwigoPublishing.c"
+#line 9900 "PiwigoPublishing.c"
 			PublishingPiwigoCategory* _tmp1_ = NULL;
 			PublishingPiwigoCategory* cat = NULL;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			cat = _tmp1_;
-#line 9159 "PiwigoPublishing.c"
+#line 9907 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingPiwigoCategory* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->existing_categories_combo;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = cat;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = _tmp3_->display_name;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (cat);
-#line 9174 "PiwigoPublishing.c"
+#line 9922 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->existing_categories;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5__length1 = self->priv->existing_categories_length1;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5__length1 == 0) {
-#line 9184 "PiwigoPublishing.c"
+#line 9932 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp6_ = NULL;
 		GtkRadioButton* _tmp7_ = NULL;
 		GtkRadioButton* _tmp8_ = NULL;
 		GtkTextView* _tmp9_ = NULL;
 		GtkLabel* _tmp10_ = NULL;
 		GtkEntry* _tmp11_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = self->priv->existing_categories_combo;
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = self->priv->use_existing_radio;
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->create_new_radio;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->album_comment;
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = self->priv->album_comment_label;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = self->priv->new_category_entry;
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 9215 "PiwigoPublishing.c"
+#line 9963 "PiwigoPublishing.c"
 	} else {
 		gint last_category_index = 0;
 		gint _tmp12_ = 0;
@@ -9232,64 +9983,64 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		GtkEntry* _tmp18_ = NULL;
 		GtkTextView* _tmp19_ = NULL;
 		GtkLabel* _tmp20_ = NULL;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = self->priv->last_category;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp12_);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		last_category_index = _tmp13_;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = last_category_index;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp14_ < 0) {
-#line 9234 "PiwigoPublishing.c"
+#line 9982 "PiwigoPublishing.c"
 			GtkComboBoxText* _tmp15_ = NULL;
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = self->priv->existing_categories_combo;
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 9240 "PiwigoPublishing.c"
+#line 9988 "PiwigoPublishing.c"
 		} else {
 			GtkComboBoxText* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = self->priv->existing_categories_combo;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = last_category_index;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
-#line 9250 "PiwigoPublishing.c"
+#line 9998 "PiwigoPublishing.c"
 		}
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = self->priv->new_category_entry;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = self->priv->album_comment;
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = self->priv->album_comment_label;
-#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 9264 "PiwigoPublishing.c"
+#line 10012 "PiwigoPublishing.c"
 	}
-#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_);
-#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp22_) {
-#line 9272 "PiwigoPublishing.c"
+#line 10020 "PiwigoPublishing.c"
 		GtkEntry* _tmp23_ = NULL;
 		const gchar* _tmp24_ = NULL;
-#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = self->priv->new_category_entry;
-#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp24_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 9281 "PiwigoPublishing.c"
+#line 10029 "PiwigoPublishing.c"
 	}
 }
 
@@ -9301,67 +10052,67 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 	GtkLabel* _tmp6_ = NULL;
 	GtkComboBoxText* _tmp7_ = NULL;
 	GtkComboBoxText* _tmp8_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->within_existing_combo;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->existing_categories;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = self->priv->existing_categories_length1;
-#line 9303 "PiwigoPublishing.c"
+#line 10051 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoCategory** cat_collection = NULL;
 		gint cat_collection_length1 = 0;
 		gint _cat_collection_size_ = 0;
 		gint cat_it = 0;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cat_collection = _tmp1_;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cat_collection_length1 = _tmp1__length1;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cat_it = 0; cat_it < _tmp1__length1; cat_it = cat_it + 1) {
-#line 9315 "PiwigoPublishing.c"
+#line 10063 "PiwigoPublishing.c"
 			PublishingPiwigoCategory* _tmp2_ = NULL;
 			PublishingPiwigoCategory* cat = NULL;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp2_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			cat = _tmp2_;
-#line 9322 "PiwigoPublishing.c"
+#line 10070 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp3_ = NULL;
 				PublishingPiwigoCategory* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->within_existing_combo;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = cat;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = _tmp4_->display_name;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (cat);
-#line 9337 "PiwigoPublishing.c"
+#line 10085 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->within_existing_label;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->within_existing_combo;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = self->priv->within_existing_combo;
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 9353 "PiwigoPublishing.c"
+#line 10101 "PiwigoPublishing.c"
 }
 
 
@@ -9372,77 +10123,77 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->perm_levels;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->perm_levels_length1;
-#line 9370 "PiwigoPublishing.c"
+#line 10118 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoPermissionLevel** perm_collection = NULL;
 		gint perm_collection_length1 = 0;
 		gint _perm_collection_size_ = 0;
 		gint perm_it = 0;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		perm_collection = _tmp0_;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		perm_collection_length1 = _tmp0__length1;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 9382 "PiwigoPublishing.c"
+#line 10130 "PiwigoPublishing.c"
 			PublishingPiwigoPermissionLevel* _tmp1_ = NULL;
 			PublishingPiwigoPermissionLevel* perm = NULL;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			perm = _tmp1_;
-#line 9389 "PiwigoPublishing.c"
+#line 10137 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingPiwigoPermissionLevel* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->perms_combo;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = perm;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = _tmp3_->name;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_permission_level_unref0 (perm);
-#line 9404 "PiwigoPublishing.c"
+#line 10152 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->last_permission_level;
-#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
-#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	last_permission_level_index = _tmp6_;
-#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = last_permission_level_index;
-#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 9418 "PiwigoPublishing.c"
+#line 10166 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp8_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->perms_combo;
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 9424 "PiwigoPublishing.c"
+#line 10172 "PiwigoPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->perms_combo;
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = last_permission_level_index;
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 9434 "PiwigoPublishing.c"
+#line 10182 "PiwigoPublishing.c"
 	}
 }
 
@@ -9454,112 +10205,112 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->photo_sizes;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 9452 "PiwigoPublishing.c"
+#line 10200 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoSizeEntry** size_collection = NULL;
 		gint size_collection_length1 = 0;
 		gint _size_collection_size_ = 0;
 		gint size_it = 0;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		size_collection = _tmp0_;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		size_collection_length1 = _tmp0__length1;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 9464 "PiwigoPublishing.c"
+#line 10212 "PiwigoPublishing.c"
 			PublishingPiwigoSizeEntry* _tmp1_ = NULL;
 			PublishingPiwigoSizeEntry* size = NULL;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			size = _tmp1_;
-#line 9471 "PiwigoPublishing.c"
+#line 10219 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingPiwigoSizeEntry* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->size_combo;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = size;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = _tmp3_->name;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_size_entry_unref0 (size);
-#line 9486 "PiwigoPublishing.c"
+#line 10234 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->last_photo_size;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	last_size_index = _tmp6_;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = last_size_index;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 9500 "PiwigoPublishing.c"
+#line 10248 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->size_combo;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 9509 "PiwigoPublishing.c"
+#line 10257 "PiwigoPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = last_size_index;
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 9519 "PiwigoPublishing.c"
+#line 10267 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 9528 "PiwigoPublishing.c"
+#line 10276 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 9539 "PiwigoPublishing.c"
+#line 10287 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 9544 "PiwigoPublishing.c"
+#line 10292 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 9551 "PiwigoPublishing.c"
+#line 10299 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
 				PublishingPiwigoCategory** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -9569,85 +10320,85 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 				PublishingPiwigoCategory* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 9563 "PiwigoPublishing.c"
+#line 10311 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 9569 "PiwigoPublishing.c"
+#line 10317 "PiwigoPublishing.c"
 				}
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->existing_categories;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3__length1 = self->priv->existing_categories_length1;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9583 "PiwigoPublishing.c"
+#line 10331 "PiwigoPublishing.c"
 				}
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->existing_categories;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4__length1 = self->priv->existing_categories_length1;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = i;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = _tmp4_[_tmp5_];
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = category_id;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 9599 "PiwigoPublishing.c"
+#line 10347 "PiwigoPublishing.c"
 					gint _tmp9_ = 0;
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9607 "PiwigoPublishing.c"
+#line 10355 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9616 "PiwigoPublishing.c"
+#line 10364 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 9627 "PiwigoPublishing.c"
+#line 10375 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 9632 "PiwigoPublishing.c"
+#line 10380 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 9639 "PiwigoPublishing.c"
+#line 10387 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
 				PublishingPiwigoPermissionLevel** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -9657,85 +10408,85 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 9651 "PiwigoPublishing.c"
+#line 10399 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 9657 "PiwigoPublishing.c"
+#line 10405 "PiwigoPublishing.c"
 				}
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->perm_levels;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3__length1 = self->priv->perm_levels_length1;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9671 "PiwigoPublishing.c"
+#line 10419 "PiwigoPublishing.c"
 				}
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->perm_levels;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4__length1 = self->priv->perm_levels_length1;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = i;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = _tmp4_[_tmp5_];
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = permission_level_id;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 9687 "PiwigoPublishing.c"
+#line 10435 "PiwigoPublishing.c"
 					gint _tmp9_ = 0;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9695 "PiwigoPublishing.c"
+#line 10443 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9704 "PiwigoPublishing.c"
+#line 10452 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 9715 "PiwigoPublishing.c"
+#line 10463 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 9720 "PiwigoPublishing.c"
+#line 10468 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 9727 "PiwigoPublishing.c"
+#line 10475 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
 				PublishingPiwigoSizeEntry** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -9745,62 +10496,62 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				PublishingPiwigoSizeEntry* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 9739 "PiwigoPublishing.c"
+#line 10487 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 9745 "PiwigoPublishing.c"
+#line 10493 "PiwigoPublishing.c"
 				}
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->photo_sizes;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3__length1 = self->priv->photo_sizes_length1;
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9759 "PiwigoPublishing.c"
+#line 10507 "PiwigoPublishing.c"
 				}
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->photo_sizes;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4__length1 = self->priv->photo_sizes_length1;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = i;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = _tmp4_[_tmp5_];
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = size_id;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 9775 "PiwigoPublishing.c"
+#line 10523 "PiwigoPublishing.c"
 					gint _tmp9_ = 0;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9783 "PiwigoPublishing.c"
+#line 10531 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9792 "PiwigoPublishing.c"
+#line 10540 "PiwigoPublishing.c"
 }
 
 
@@ -9809,36 +10560,36 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 	gboolean _result_ = FALSE;
 	PublishingPiwigoCategory** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (category_name != NULL, FALSE);
-#line 1466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = FALSE;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->existing_categories;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->existing_categories_length1;
-#line 9811 "PiwigoPublishing.c"
+#line 10559 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoCategory** category_collection = NULL;
 		gint category_collection_length1 = 0;
 		gint _category_collection_size_ = 0;
 		gint category_it = 0;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		category_collection = _tmp0_;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		category_collection_length1 = _tmp0__length1;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (category_it = 0; category_it < _tmp0__length1; category_it = category_it + 1) {
-#line 9823 "PiwigoPublishing.c"
+#line 10571 "PiwigoPublishing.c"
 			PublishingPiwigoCategory* _tmp1_ = NULL;
 			PublishingPiwigoCategory* category = NULL;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_category_ref0 (category_collection[category_it]);
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			category = _tmp1_;
-#line 9830 "PiwigoPublishing.c"
+#line 10578 "PiwigoPublishing.c"
 			{
 				PublishingPiwigoCategory* _tmp2_ = NULL;
 				const gchar* _tmp3_ = NULL;
@@ -9846,41 +10597,41 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 				gchar* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = category;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = _tmp2_->display_name;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = string_strip (_tmp3_);
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = _tmp4_;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = category_name;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp5_);
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_) {
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = TRUE;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_piwigo_category_unref0 (category);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 9860 "PiwigoPublishing.c"
+#line 10608 "PiwigoPublishing.c"
 				}
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (category);
-#line 9864 "PiwigoPublishing.c"
+#line 10612 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9872 "PiwigoPublishing.c"
+#line 10620 "PiwigoPublishing.c"
 }
 
 
@@ -9891,130 +10642,130 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = closure->data;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9891 "PiwigoPublishing.c"
+#line 10639 "PiwigoPublishing.c"
 	} else {
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 9897 "PiwigoPublishing.c"
+#line 10645 "PiwigoPublishing.c"
 	}
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 9903 "PiwigoPublishing.c"
+#line 10651 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = _ ("Shotwell Connect");
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_;
-#line 9926 "PiwigoPublishing.c"
+#line 10674 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_widget;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_preferred_geometry;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled;
-#line 9941 "PiwigoPublishing.c"
+#line 10689 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self) {
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->title_as_comment_check = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->no_upload_tags_check = NULL;
-#line 9956 "PiwigoPublishing.c"
+#line 10704 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) {
 	PublishingPiwigoPublishingOptionsPane * self;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->existing_categories_combo);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->new_category_entry);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->within_existing_label);
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->within_existing_combo);
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->perms_combo);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->title_as_comment_check);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->album_comment);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->album_comment_label);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10006 "PiwigoPublishing.c"
+#line 10754 "PiwigoPublishing.c"
 }
 
 
@@ -10037,18 +10788,18 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) {
 
 PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) {
 	PublishingPiwigoSession* self = NULL;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10033 "PiwigoPublishing.c"
+#line 10781 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSession* publishing_piwigo_session_new (void) {
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 10040 "PiwigoPublishing.c"
+#line 10788 "PiwigoPublishing.c"
 }
 
 
@@ -10058,43 +10809,43 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->pwg_id;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 10056 "PiwigoPublishing.c"
+#line 10804 "PiwigoPublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = self->priv->pwg_url;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 10062 "PiwigoPublishing.c"
+#line 10810 "PiwigoPublishing.c"
 	} else {
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 10066 "PiwigoPublishing.c"
+#line 10814 "PiwigoPublishing.c"
 	}
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 10070 "PiwigoPublishing.c"
+#line 10818 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 10076 "PiwigoPublishing.c"
+#line 10824 "PiwigoPublishing.c"
 	} else {
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 10080 "PiwigoPublishing.c"
+#line 10828 "PiwigoPublishing.c"
 	}
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp0_;
-#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10086 "PiwigoPublishing.c"
+#line 10834 "PiwigoPublishing.c"
 }
 
 
@@ -10105,58 +10856,58 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = url;
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = _tmp1_;
-#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = _tmp3_;
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = id;
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp5_;
-#line 10129 "PiwigoPublishing.c"
+#line 10877 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = NULL;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = NULL;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 10148 "PiwigoPublishing.c"
+#line 10896 "PiwigoPublishing.c"
 }
 
 
@@ -10164,17 +10915,17 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->username;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10166 "PiwigoPublishing.c"
+#line 10914 "PiwigoPublishing.c"
 }
 
 
@@ -10182,17 +10933,17 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pwg_url;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10184 "PiwigoPublishing.c"
+#line 10932 "PiwigoPublishing.c"
 }
 
 
@@ -10200,78 +10951,78 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pwg_id;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10202 "PiwigoPublishing.c"
+#line 10950 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = id;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp1_;
-#line 10221 "PiwigoPublishing.c"
+#line 10969 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) {
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass);
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_piwigo_session_finalize;
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_piwigo_session_real_is_authenticated;
-#line 10234 "PiwigoPublishing.c"
+#line 10982 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) {
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = NULL;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = NULL;
-#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 10247 "PiwigoPublishing.c"
+#line 10995 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingPiwigoSession * self;
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 10263 "PiwigoPublishing.c"
+#line 11011 "PiwigoPublishing.c"
 }
 
 
@@ -10296,52 +11047,52 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSession* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = session;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_) {
-#line 10300 "PiwigoPublishing.c"
+#line 11048 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = session;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 10322 "PiwigoPublishing.c"
+#line 11070 "PiwigoPublishing.c"
 	}
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10326 "PiwigoPublishing.c"
+#line 11074 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 10333 "PiwigoPublishing.c"
+#line 11081 "PiwigoPublishing.c"
 }
 
 
@@ -10356,46 +11107,46 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = session;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = session;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10380 "PiwigoPublishing.c"
+#line 11128 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 10387 "PiwigoPublishing.c"
+#line 11135 "PiwigoPublishing.c"
 }
 
 
@@ -10419,143 +11170,143 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = doc;
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	root = _tmp1_;
-#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = root;
-#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	status = _tmp3_;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = status;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 10429 "PiwigoPublishing.c"
+#line 11177 "PiwigoPublishing.c"
 		gchar* _tmp5_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp5_;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 10439 "PiwigoPublishing.c"
+#line 11187 "PiwigoPublishing.c"
 	}
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = status;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = NULL;
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 10451 "PiwigoPublishing.c"
+#line 11199 "PiwigoPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
 		xmlNode* _tmp9_ = NULL;
 		xmlNode* _tmp10_ = NULL;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = doc;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = root;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10470 "PiwigoPublishing.c"
-				goto __catch46_spit_publishing_publishing_error;
+#line 11218 "PiwigoPublishing.c"
+				goto __catch47_spit_publishing_publishing_error;
 			}
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 10481 "PiwigoPublishing.c"
+#line 11229 "PiwigoPublishing.c"
 		}
-#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp7_;
-#line 10485 "PiwigoPublishing.c"
+#line 11233 "PiwigoPublishing.c"
 	}
-	goto __finally46;
-	__catch46_spit_publishing_publishing_error:
+	goto __finally47;
+	__catch47_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp11_;
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 10506 "PiwigoPublishing.c"
+#line 11254 "PiwigoPublishing.c"
 	}
-	__finally46:
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally47:
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 10519 "PiwigoPublishing.c"
+#line 11267 "PiwigoPublishing.c"
 	}
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = errcode;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = errcode;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp19_;
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (status);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10547 "PiwigoPublishing.c"
+#line 11295 "PiwigoPublishing.c"
 }
 
 
@@ -10568,93 +11319,93 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 	xmlNode* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = doc;
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	root = _tmp1_;
-#line 10568 "PiwigoPublishing.c"
+#line 11316 "PiwigoPublishing.c"
 	{
 		xmlNode* _tmp2_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = doc;
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = root;
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_);
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = _tmp5_;
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10586 "PiwigoPublishing.c"
-				goto __catch47_spit_publishing_publishing_error;
+#line 11334 "PiwigoPublishing.c"
+				goto __catch48_spit_publishing_publishing_error;
 			}
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			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 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 10595 "PiwigoPublishing.c"
+#line 11343 "PiwigoPublishing.c"
 		}
-#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp2_;
-#line 10599 "PiwigoPublishing.c"
+#line 11347 "PiwigoPublishing.c"
 	}
-	goto __finally47;
-	__catch47_spit_publishing_publishing_error:
+	goto __finally48;
+	__catch48_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = g_strdup ("0");
-#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp6_;
-#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 10618 "PiwigoPublishing.c"
+#line 11366 "PiwigoPublishing.c"
 	}
-	__finally47:
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally48:
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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);
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 10629 "PiwigoPublishing.c"
+#line 11377 "PiwigoPublishing.c"
 	}
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = errcode;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code");
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp8_;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10639 "PiwigoPublishing.c"
+#line 11387 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10646 "PiwigoPublishing.c"
+#line 11394 "PiwigoPublishing.c"
 }
 
 
@@ -10688,47 +11439,140 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (password != NULL, NULL);
-#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login");
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = password;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10706 "PiwigoPublishing.c"
+#line 11454 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 10713 "PiwigoPublishing.c"
+#line 11461 "PiwigoPublishing.c"
+}
+
+
+static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self ? publishing_rest_support_argument_ref (self) : NULL;
+#line 11468 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+	PublishingPiwigoSessionLoginTransaction* self = NULL;
+	PublishingPiwigoSession* _tmp0_ = NULL;
+	PublishingPiwigoTransaction* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	PublishingPiwigoTransaction* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	PublishingRESTSupportArgument** _tmp6_ = NULL;
+#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
+#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_TRANSACTION (other), NULL);
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = session;
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = other;
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp3_);
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = other;
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
+#line 11501 "PiwigoPublishing.c"
+	{
+		PublishingRESTSupportArgument** argument_collection = NULL;
+		gint argument_collection_length1 = 0;
+		gint _argument_collection_size_ = 0;
+		gint argument_it = 0;
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		argument_collection = _tmp6_;
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		argument_collection_length1 = _tmp5_;
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
+#line 11513 "PiwigoPublishing.c"
+			PublishingRESTSupportArgument* _tmp7_ = NULL;
+			PublishingRESTSupportArgument* argument = NULL;
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			argument = _tmp7_;
+#line 11520 "PiwigoPublishing.c"
+			{
+				PublishingRESTSupportArgument* _tmp8_ = NULL;
+				const gchar* _tmp9_ = NULL;
+				PublishingRESTSupportArgument* _tmp10_ = NULL;
+				const gchar* _tmp11_ = NULL;
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp8_ = argument;
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp9_ = _tmp8_->key;
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp10_ = argument;
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp11_ = _tmp10_->value;
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_publishing_rest_support_argument_unref0 (argument);
+#line 11538 "PiwigoPublishing.c"
+			}
+		}
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 11543 "PiwigoPublishing.c"
+	}
+#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self;
+#line 11547 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
+#line 11554 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10720 "PiwigoPublishing.c"
+#line 11561 "PiwigoPublishing.c"
 }
 
 
@@ -10760,77 +11604,77 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (pwg_id != NULL, NULL);
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = session;
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10784 "PiwigoPublishing.c"
+#line 11625 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 10791 "PiwigoPublishing.c"
+#line 11632 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10808 "PiwigoPublishing.c"
+#line 11649 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 10815 "PiwigoPublishing.c"
+#line 11656 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10822 "PiwigoPublishing.c"
+#line 11663 "PiwigoPublishing.c"
 }
 
 
@@ -10856,33 +11700,33 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoCategoriesGetListTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList");
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10860 "PiwigoPublishing.c"
+#line 11701 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 10867 "PiwigoPublishing.c"
+#line 11708 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10874 "PiwigoPublishing.c"
+#line 11715 "PiwigoPublishing.c"
 }
 
 
@@ -10908,31 +11752,31 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionLogoutTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10910 "PiwigoPublishing.c"
+#line 11751 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 10917 "PiwigoPublishing.c"
+#line 11758 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10924 "PiwigoPublishing.c"
+#line 11765 "PiwigoPublishing.c"
 }
 
 
@@ -10958,69 +11802,69 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	const gchar* _tmp6_ = NULL;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (category != NULL, NULL);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add");
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = category;
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = parent_id;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != 0) {
-#line 10968 "PiwigoPublishing.c"
+#line 11809 "PiwigoPublishing.c"
 		gint _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = parent_id;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = g_strdup_printf ("%i", _tmp3_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 10982 "PiwigoPublishing.c"
+#line 11823 "PiwigoPublishing.c"
 	}
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = comment;
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 10988 "PiwigoPublishing.c"
+#line 11829 "PiwigoPublishing.c"
 		const gchar* _tmp7_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = comment;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 10994 "PiwigoPublishing.c"
+#line 11835 "PiwigoPublishing.c"
 	}
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10998 "PiwigoPublishing.c"
+#line 11839 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 11005 "PiwigoPublishing.c"
+#line 11846 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11012 "PiwigoPublishing.c"
+#line 11853 "PiwigoPublishing.c"
 }
 
 
@@ -11053,7 +11897,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 11045 "PiwigoPublishing.c"
+#line 11886 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -11063,7 +11907,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 11055 "PiwigoPublishing.c"
+#line 11896 "PiwigoPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -11073,13 +11917,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 11065 "PiwigoPublishing.c"
+#line 11906 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 11071 "PiwigoPublishing.c"
+#line 11912 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -11090,7 +11934,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 11082 "PiwigoPublishing.c"
+#line 11923 "PiwigoPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -11102,19 +11946,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 11094 "PiwigoPublishing.c"
+#line 11935 "PiwigoPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 11098 "PiwigoPublishing.c"
+#line 11939 "PiwigoPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 11102 "PiwigoPublishing.c"
+#line 11943 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 11106 "PiwigoPublishing.c"
+#line 11947 "PiwigoPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -11137,7 +11981,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_ = NULL;
 #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 11129 "PiwigoPublishing.c"
+#line 11970 "PiwigoPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11146,7 +11990,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 11138 "PiwigoPublishing.c"
+#line 11979 "PiwigoPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -11159,13 +12003,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_ = 0UL;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 11151 "PiwigoPublishing.c"
+#line 11992 "PiwigoPublishing.c"
 					gint _tmp10_ = 0;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 11157 "PiwigoPublishing.c"
+#line 11998 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -11175,7 +12019,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 11167 "PiwigoPublishing.c"
+#line 12008 "PiwigoPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -11187,17 +12031,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 11179 "PiwigoPublishing.c"
+#line 12020 "PiwigoPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 11183 "PiwigoPublishing.c"
+#line 12024 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 11189 "PiwigoPublishing.c"
+#line 12030 "PiwigoPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -11208,7 +12052,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 11200 "PiwigoPublishing.c"
+#line 12041 "PiwigoPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -11223,21 +12067,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 11215 "PiwigoPublishing.c"
+#line 12056 "PiwigoPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 11219 "PiwigoPublishing.c"
+#line 12060 "PiwigoPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 11223 "PiwigoPublishing.c"
+#line 12064 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 11229 "PiwigoPublishing.c"
+#line 12070 "PiwigoPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -11249,7 +12093,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 11241 "PiwigoPublishing.c"
+#line 12082 "PiwigoPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -11270,24 +12114,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 11262 "PiwigoPublishing.c"
+#line 12103 "PiwigoPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 11266 "PiwigoPublishing.c"
+#line 12107 "PiwigoPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 11272 "PiwigoPublishing.c"
+#line 12113 "PiwigoPublishing.c"
 			}
 		}
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 11279 "PiwigoPublishing.c"
+#line 12120 "PiwigoPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -11295,7 +12139,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 11287 "PiwigoPublishing.c"
+#line 12128 "PiwigoPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -11333,7 +12177,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 11325 "PiwigoPublishing.c"
+#line 12166 "PiwigoPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11342,7 +12186,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 11334 "PiwigoPublishing.c"
+#line 12175 "PiwigoPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -11358,13 +12202,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_ = NULL;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 11350 "PiwigoPublishing.c"
+#line 12191 "PiwigoPublishing.c"
 					gint _tmp47_ = 0;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 11356 "PiwigoPublishing.c"
+#line 12197 "PiwigoPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -11378,7 +12222,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 11370 "PiwigoPublishing.c"
+#line 12211 "PiwigoPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -11398,7 +12242,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 11390 "PiwigoPublishing.c"
+#line 12231 "PiwigoPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -11413,11 +12257,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 11405 "PiwigoPublishing.c"
+#line 12246 "PiwigoPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 11409 "PiwigoPublishing.c"
+#line 12250 "PiwigoPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -11425,7 +12269,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 11417 "PiwigoPublishing.c"
+#line 12258 "PiwigoPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11436,7 +12280,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 11428 "PiwigoPublishing.c"
+#line 12269 "PiwigoPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11445,15 +12289,15 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 11437 "PiwigoPublishing.c"
+#line 12278 "PiwigoPublishing.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	var = (g_free (var), NULL);
-#line 11445 "PiwigoPublishing.c"
+#line 12286 "PiwigoPublishing.c"
 }
 
 
@@ -11519,381 +12363,381 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	gchar* _tmp74_ = NULL;
 	gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishable;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = session;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_);
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = session;
-#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 11537 "PiwigoPublishing.c"
+#line 12378 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = session;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp11_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 11559 "PiwigoPublishing.c"
+#line 12400 "PiwigoPublishing.c"
 	}
-#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
-#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_);
-#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp13_;
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = publishable;
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_);
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords = _tmp16_;
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords_length1 = _tmp15_;
-#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_keywords_size_ = keywords_length1;
-#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = g_strdup ("");
-#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	tags = _tmp17_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = keywords;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18__length1 = keywords_length1;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp18_ != NULL) {
-#line 11589 "PiwigoPublishing.c"
+#line 12430 "PiwigoPublishing.c"
 		gchar** _tmp19_ = NULL;
 		gint _tmp19__length1 = 0;
 		gchar* _tmp20_ = NULL;
-#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = keywords;
-#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19__length1 = keywords_length1;
-#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1);
-#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (tags);
-#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		tags = _tmp20_;
-#line 11603 "PiwigoPublishing.c"
+#line 12444 "PiwigoPublishing.c"
 	}
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = g_file_get_basename (_tmp23_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp25_ = _tmp24_;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = parameters;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp27_ = _tmp26_->category;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp28_ = _tmp27_->id;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp29_ = parameters;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp30_ = _tmp29_->perm_level;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp31_ = _tmp30_->id;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:1663: PiwigoConnector: Uploading photo %s to cat" \
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:1766: PiwigoConnector: Uploading photo %s to cat" \
 "egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp32_ = publishable;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	name = _tmp33_;
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp34_ = publishable;
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	comment = _tmp35_;
-#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp36_ = name;
-#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp36_, "") != 0) {
-#line 11649 "PiwigoPublishing.c"
+#line 12490 "PiwigoPublishing.c"
 		SpitPublishingPublishable* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
 		const gchar* _tmp39_ = NULL;
 		gboolean _tmp40_ = FALSE;
 		const gchar* _tmp41_ = NULL;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp37_ = publishable;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		name = _tmp38_;
-#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp39_ = name;
-#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_);
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp41_ = comment;
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp41_ != NULL) {
-#line 11671 "PiwigoPublishing.c"
+#line 12512 "PiwigoPublishing.c"
 			const gchar* _tmp42_ = NULL;
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = comment;
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = g_strcmp0 (_tmp42_, "") != 0;
-#line 11677 "PiwigoPublishing.c"
+#line 12518 "PiwigoPublishing.c"
 		} else {
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = FALSE;
-#line 11681 "PiwigoPublishing.c"
+#line 12522 "PiwigoPublishing.c"
 		}
-#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp40_) {
-#line 11685 "PiwigoPublishing.c"
+#line 12526 "PiwigoPublishing.c"
 			const gchar* _tmp43_ = NULL;
-#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp43_ = comment;
-#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_);
-#line 11691 "PiwigoPublishing.c"
+#line 12532 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp44_ = FALSE;
 		const gchar* _tmp45_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp45_ = comment;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp45_ != NULL) {
-#line 11700 "PiwigoPublishing.c"
+#line 12541 "PiwigoPublishing.c"
 			const gchar* _tmp46_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = comment;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = g_strcmp0 (_tmp46_, "") != 0;
-#line 11706 "PiwigoPublishing.c"
+#line 12547 "PiwigoPublishing.c"
 		} else {
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = FALSE;
-#line 11710 "PiwigoPublishing.c"
+#line 12551 "PiwigoPublishing.c"
 		}
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp44_) {
-#line 11714 "PiwigoPublishing.c"
+#line 12555 "PiwigoPublishing.c"
 			const gchar* _tmp47_ = NULL;
 			const gchar* _tmp48_ = NULL;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp47_ = name;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_);
-#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp48_ = comment;
-#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_);
-#line 11725 "PiwigoPublishing.c"
+#line 12566 "PiwigoPublishing.c"
 		} else {
 			PublishingPiwigoPublishingParameters* _tmp49_ = NULL;
 			gboolean _tmp50_ = FALSE;
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp49_ = parameters;
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp50_ = _tmp49_->title_as_comment;
-#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp50_) {
-#line 11735 "PiwigoPublishing.c"
+#line 12576 "PiwigoPublishing.c"
 				const gchar* _tmp51_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp51_ = name;
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_);
-#line 11741 "PiwigoPublishing.c"
+#line 12582 "PiwigoPublishing.c"
 			} else {
 				const gchar* _tmp52_ = NULL;
-#line 1688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp52_ = name;
-#line 1688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_);
-#line 11748 "PiwigoPublishing.c"
+#line 12589 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple");
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp53_ = parameters;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp54_ = _tmp53_->category;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp55_ = _tmp54_->id;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp56_ = g_strdup_printf ("%i", _tmp55_);
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp57_ = _tmp56_;
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_);
-#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp57_);
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp58_ = parameters;
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp59_ = _tmp58_->perm_level;
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp60_ = _tmp59_->id;
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp61_ = g_strdup_printf ("%i", _tmp60_);
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_);
-#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp62_);
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp63_ = parameters;
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp64_ = _tmp63_->no_upload_tags;
-#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp64_) {
-#line 11788 "PiwigoPublishing.c"
+#line 12629 "PiwigoPublishing.c"
 		const gchar* _tmp65_ = NULL;
-#line 1696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp65_ = tags;
-#line 1696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp65_, "") != 0) {
-#line 11794 "PiwigoPublishing.c"
+#line 12635 "PiwigoPublishing.c"
 			const gchar* _tmp66_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp66_ = tags;
-#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_);
-#line 11800 "PiwigoPublishing.c"
+#line 12641 "PiwigoPublishing.c"
 		}
 	}
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp67_ = g_str_hash;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp68_ = g_str_equal;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_);
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	disposition_table = _tmp69_;
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp70_ = g_strdup ("filename");
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp71_ = publishable;
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp73_ = _tmp72_;
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp74_ = soup_uri_encode (_tmp73_, NULL);
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_hash_table_insert (disposition_table, _tmp70_, _tmp74_);
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp73_);
-#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp75_ = g_strdup ("name");
-#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp76_ = g_strdup ("image");
-#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_hash_table_insert (disposition_table, _tmp75_, _tmp76_);
-#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (comment);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (name);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (tags);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11845 "PiwigoPublishing.c"
+#line 12686 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable);
-#line 11852 "PiwigoPublishing.c"
+#line 12693 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) {
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 11863 "PiwigoPublishing.c"
+#line 12704 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) {
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
-#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 11872 "PiwigoPublishing.c"
+#line 12713 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingPiwigoImagesAddTransaction * self;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
-#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 11884 "PiwigoPublishing.c"
+#line 12725 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 63623ea..0b98f05 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -284,6 +284,30 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
         host.set_dialog_default_widget(authentication_pane.get_default_widget());
     }
 
+    private void do_show_ssl_downgrade_pane (SessionLoginTransaction trans,
+                                             string url) {
+        var uri = new Soup.URI (url);
+        host.set_service_locked (false);
+        var ssl_pane = new SSLErrorPane (trans, uri.get_host ());
+        ssl_pane.proceed.connect (() => {
+            debug ("SSL: User wants us to retry with broken certificate");
+            this.session = new Session ();
+            this.session.set_insecure ();
+
+            string? persistent_url = get_persistent_url();
+            string? persistent_username = get_persistent_username();
+            string? persistent_password = get_persistent_password();
+            if (persistent_url != null && persistent_username != null && persistent_password != null)
+                do_network_login(persistent_url, persistent_username,
+                    persistent_password, get_remember_password());
+            else
+                do_show_authentication_pane();
+        });
+        host.install_dialog_pane (ssl_pane,
+                                  Spit.Publishing.PluginHost.ButtonMode.CLOSE);
+        host.set_dialog_default_widget (ssl_pane.get_default_widget ());
+    }
+
     /**
      * Event triggered when the login button in the authentication panel is
      * clicked.
@@ -335,8 +359,13 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
         try {
             login_trans.execute();
         } catch (Spit.Publishing.PublishingError err) {
-            debug("ERROR: do_network_login");
-            do_show_error(err);
+            if (err is Spit.Publishing.PublishingError.SSL_FAILED) {
+                debug ("ERROR: SSL connection problems");
+                do_show_ssl_downgrade_pane (login_trans, url);
+            } else {
+                debug("ERROR: do_network_login");
+                do_show_error(err);
+            }
         }
     }
     
@@ -400,7 +429,6 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("Setting endpoint URL to %s", endpoint_url);
         string pwg_id = get_pwg_id_from_transaction(txn);
         debug("Setting session pwg_id to %s", pwg_id);
-        session = new Session();
         session.set_pwg_id(pwg_id);
 
         do_fetch_session_status(endpoint_url, pwg_id);
@@ -744,7 +772,7 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
         assert(category.is_local());
 
         host.set_service_locked(true);
-        host.install_static_message_pane(_("Creating album %s...").printf(category.name));
+        host.install_static_message_pane(_("Creating album %s…").printf(category.name));
 
         CategoriesAddTransaction creation_trans = new CategoriesAddTransaction(
             session, category.name.strip(), int.parse(category.uppercats), category.comment);
@@ -977,6 +1005,73 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
 
 // UI elements
 
+internal class SSLErrorPane : Spit.Publishing.DialogPane, Object {
+    private Gtk.Builder builder;
+    private Gtk.Widget content;
+
+    public signal void proceed ();
+
+    public SSLErrorPane (SessionLoginTransaction transaction,
+                         string host) {
+        try {
+            TlsCertificate cert;
+            this.builder = new Gtk.Builder ();
+            this.builder.add_from_resource (Resources.RESOURCE_PATH +
+                                            "/piwigo_ssl_failure_pane.ui");
+            this.content = this.builder.get_object ("content") as Gtk.Widget;
+            var label = this.builder.get_object ("main_text") as Gtk.Label;
+            // %s is the host name that we tried to connect to
+            label.set_text (_("This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).").printf (host));
+            label.use_markup = true;
+
+            label = this.builder.get_object ("ssl_errors") as Gtk.Label;
+            var text = transaction.detailed_error_from_tls_flags (out cert);
+            label.set_text (text);
+
+            var info = this.builder.get_object ("default") as Gtk.Button;
+            info.clicked.connect (() => {
+                var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
+                var widget = new Gcr.CertificateWidget (simple_cert);
+
+                var dialog = new Gtk.Dialog ();
+                dialog.get_content_area ().add (widget);
+                dialog.add_button ("_OK", Gtk.ResponseType.OK);
+                dialog.set_default_response (Gtk.ResponseType.OK);
+                dialog.set_default_size (640, -1);
+                dialog.show_all ();
+                dialog.run ();
+                dialog.destroy ();
+            });
+
+            var proceed = this.builder.get_object ("proceed_button") as Gtk.Button;
+            proceed.clicked.connect (() => { this.proceed (); });
+
+            if (this.content.parent != null) {
+                this.content.parent.remove (this.content);
+            }
+        } catch (Error error) {
+            warning ("Failed to create ui file: %s", error.message);
+            assert_not_reached ();
+        }
+    }
+
+    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry () {
+        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+    }
+
+    public Gtk.Widget get_widget () {
+        return this.content;
+    }
+
+    public Gtk.Widget get_default_widget () {
+        return this.builder.get_object ("default") as Gtk.Widget;
+    }
+
+    public void on_pane_installed () { }
+
+    public void on_pane_uninstalled () { }
+}
+
 /**
  * The authentication pane used when asking service URL, user name and password
  * from the user.
@@ -1227,10 +1322,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
     private SizeEntry[] create_sizes() {
         SizeEntry[] result = new SizeEntry[0];
 
-        result += new SizeEntry(500, _("500 x 375 pixels"));
-        result += new SizeEntry(1024, _("1024 x 768 pixels"));
-        result += new SizeEntry(2048, _("2048 x 1536 pixels"));
-        result += new SizeEntry(4096, _("4096 x 3072 pixels"));
+        result += new SizeEntry(500, _("500 × 375 pixels"));
+        result += new SizeEntry(1024, _("1024 × 768 pixels"));
+        result += new SizeEntry(2048, _("2048 × 1536 pixels"));
+        result += new SizeEntry(4096, _("4096 × 3072 pixels"));
         result += new SizeEntry(ORIGINAL_SIZE, _("Original size"));
 
         return result;
@@ -1587,6 +1682,14 @@ internal class SessionLoginTransaction : Transaction {
         add_argument("username", username);
         add_argument("password", password);
     }
+
+    public SessionLoginTransaction.from_other (Session session, Transaction other) {
+        base.with_endpoint_url (session, other.get_endpoint_url ());
+
+        foreach (var argument in other.get_arguments ()) {
+            add_argument (argument.key, argument.value);
+        }
+    }
 }
 
 /**
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index ed78ff1..4fb44d0 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -2305,8 +2305,8 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Youtube c" \
-"an't continue.");
+		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to YouTube c" \
+"an’t continue.");
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2930,7 +2930,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp39_ = self->priv->publish_to_label;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp40_ = _ ("Videos will appear in '%s'");
+	_tmp40_ = _ ("Videos will appear in “%s”");
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp41_ = publishing_parameters;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index 7325c32..48241bd 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -360,7 +360,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             warning("Could not parse UI file! Error: %s.", e.message);
             get_host().post_error(
                 new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                    _("A file required for publishing is unavailable. Publishing to Youtube can't continue.")));
+                    _("A file required for publishing is unavailable. Publishing to YouTube can’t continue.")));
             return;
         }
 
@@ -461,7 +461,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
         login_identity_label.set_label(_("You are logged into YouTube as %s.").printf(
             publishing_parameters.get_user_name()));
-        publish_to_label.set_label(_("Videos will appear in '%s'").printf(
+        publish_to_label.set_label(_("Videos will appear in “%s”").printf(
             publishing_parameters.get_channel_name()));
 
         foreach(PrivacyDescription desc in privacy_descriptions) {
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index 53bcc43..af3baad 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -12,6 +12,7 @@
       <file>picasa_publishing_options_pane.ui</file>
       <file>piwigo_authentication_pane.ui</file>
       <file>piwigo_publishing_options_pane.ui</file>
+      <file>piwigo_ssl_failure_pane.ui</file>
       <file>youtube_publishing_options_pane.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
index bd32141..ec24aed 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -148,7 +148,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Login</property>
+                    <property name="label" translatable="yes">Log in</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
new file mode 100644
index 0000000..8175627
--- /dev/null
+++ b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkWindow">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="content">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
+        <property name="margin_right">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">This connection is not secure</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="main_text">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">This does not look like the real %s. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
+            <property name="width_chars">40</property>
+            <property name="max_width_chars">40</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="ssl_errors">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin_left">12</property>
+            <property name="label">⚫ This website presented identification that belongs to a different website.
+⚫ This website’s identification could not be processed. It may be corrupted.</property>
+            <property name="wrap">True</property>
+            <property name="width_chars">52</property>
+            <property name="max_width_chars">52</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">center</property>
+            <child>
+              <object class="GtkButton" id="default">
+                <property name="label" translatable="yes">Show the certificate…</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="proceed_button">
+                <property name="label" translatable="yes">I understand, please _proceed.</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/plugins/shotwell-transitions/CircleEffect.vala b/plugins/shotwell-transitions/CircleEffect.vala
index 862a578..b03d8fb 100644
--- a/plugins/shotwell-transitions/CircleEffect.vala
+++ b/plugins/shotwell-transitions/CircleEffect.vala
@@ -47,7 +47,7 @@ private class CircleEffect : Object, Transitions.Effect {
     public void paint(Transitions.Visuals visuals, Transitions.Motion motion, Cairo.Context ctx,
         int width, int height, int frame_number) {
         double alpha = motion.get_alpha(frame_number);
-        int radius = (int)((alpha) * Math.fmax(width,height));
+        int radius = (int)(alpha * Math.fmax(width,height));
         
         if (visuals.from_pixbuf != null) {
             Gdk.cairo_set_source_pixbuf(ctx, visuals.from_pixbuf, visuals.from_pos.x,